Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump bitflags from 1.3.2 to 2.0.1 #6346

Merged
merged 4 commits into from
Mar 22, 2023
Merged

build(deps): bump bitflags from 1.3.2 to 2.0.1 #6346

merged 4 commits into from
Mar 22, 2023

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 16, 2023

Bumps bitflags from 1.3.2 to 2.0.1.

Release notes

Sourced from bitflags's releases.

2.0.1

What's Changed

New Contributors

Full Changelog: bitflags/bitflags@2.0.0...2.0.1

2.0.0

Major changes

This release includes some major changes over 1.x. If you use bitflags! types in your public API then upgrading this library may cause breakage in your downstream users.

⚠️ Serialization

You'll need to add the serde Cargo feature in order to #[derive(Serialize, Deserialize] on your generated flags types.

The default serialization format with serde has changed if you #[derive(Serialize, Deserialize)] on your generated flags types. It will now use a formatted string for human-readable formats and the underlying bits type for compact formats.

To keep the old format, see the https://github.com/KodrAus/bitflags-serde-legacy library.

⚠️ Traits

Generated flags types now derive fewer traits. You'll need to derive the following yourself:

#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy]

⚠️ Methods

The unsafe from_bits_unchecked method is now a safe from_bits_retain method.

You can add the following method to your generated types to keep them compatible:

#[deprecated = "use the safe `from_bits_retain` method instead"]
pub unsafe fn from_bits_unchecked(bits: T) -> Self {
    Self::from_bits_retain(bits)
}

where T is the underlying bits type you're using, such as u32.

What's Changed

... (truncated)

Changelog

Sourced from bitflags's changelog.

2.0.1

What's Changed

New Contributors

Full Changelog: bitflags/bitflags@2.0.0...2.0.1

2.0.0

What's Changed

New Contributors

... (truncated)

Commits
  • 8b43d2b Merge pull request #317 from KodrAus/cargo/2.0.1
  • 836eabb update changelog
  • 11de329 prepare for 2.0.1 release
  • af44dcc Merge pull request #316 from KodrAus/fix/multi-bit-flag-fmt
  • 5ba27cf use the iterator state as the source of extra bits
  • c4c13dc add repro for multi-bit flags
  • ad02711 Merge pull request #313 from tormeh/tormod/const-empty-flag
  • 242f5e7 Make empty_flag() const.
  • 2c12c2e Merge pull request #309 from bitflags/KodrAus-patch-3
  • d1d153b fix up some docs issues
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot
build(deps): bump bitflags from 1.3.2 to 2.0.1
9b999b2 
Bumps [bitflags](https://github.com/bitflags/bitflags) from 1.3.2 to 2.0.1.
- [Release notes](https://github.com/bitflags/bitflags/releases)
- [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md)
- [Commits](bitflags/bitflags@1.3.2...2.0.1)

---
updated-dependencies:
- dependency-name: bitflags
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot requested review from a team as code owners March 16, 2023 15:58
@dependabot dependabot bot requested review from oxarbitrage and removed request for a team March 16, 2023 15:58
@dependabot dependabot bot added A-dependencies Area: Dependency file updates A-rust Area: Updates to Rust code C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG P-Low ❄️ labels Mar 16, 2023
@dependabot dependabot bot mentioned this pull request Mar 16, 2023
Closed
@oxarbitrage oxarbitrage requested a review from a team as a code owner March 17, 2023 17:10
@oxarbitrage oxarbitrage requested review from upbqdn and removed request for a team March 17, 2023 17:10
@oxarbitrage oxarbitrage mentioned this pull request Mar 17, 2023
Closed
@oxarbitrage
Copy link
Contributor

b185319 :

@oxarbitrage oxarbitrage self-assigned this Mar 17, 2023
@codecov
Copy link

codecov bot commented Mar 17, 2023 •
edited

Codecov Report

Merging #6346 (940fd7a) into main (c0849ad) will decrease coverage by 0.02%.
The diff coverage is 20.00%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6346      +/-   ##
==========================================
- Coverage   77.73%   77.71%   -0.02%     
==========================================
  Files         304      304              
  Lines       39528    39584      +56     
==========================================
+ Hits        30726    30763      +37     
- Misses       8802     8821      +19

@oxarbitrage
Copy link
Contributor

lightwalletd sync to tip errors : https://github.com/ZcashFoundation/zebra/actions/runs/4449930969/jobs/7815647985?pr=6346 retrying.

@oxarbitrage
Copy link
Contributor

I will like someone else to review this one as i made the changes needed to the code to support the new version upgrade.

@oxarbitrage oxarbitrage removed their request for review March 18, 2023 13:24
@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Mar 20, 2023

A newer version of bitflags exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

upbqdn
upbqdn previously approved these changes Mar 20, 2023
View reviewed changes
Copy link
Member

@upbqdn upbqdn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, two optional suggestions.

I looked at the new dependency bitflags-serde-legacy. It is just this short file https://github.com/KodrAus/bitflags-serde-legacy/blob/main/src/lib.rs. Should we consider rewriting it directly to our codebase so that we don't have a new dependency?

zebra-chain/src/orchard/shielded_data.rs Outdated Show resolved Hide resolved
zebra-chain/src/orchard/shielded_data.rs Outdated Show resolved Hide resolved
@teor2345
Copy link
Contributor

I looked at the new dependency bitflags-serde-legacy. It is just this short file https://github.com/KodrAus/bitflags-serde-legacy/blob/main/src/lib.rs. Should we consider rewriting it directly to our codebase so that we don't have a new dependency?

I wonder if it will get fixes that we then have to copy into our code?

It seems like a small, low risk dependency.

@upbqdn
Copy link
Member

upbqdn commented Mar 21, 2023

It seems like a small, low risk dependency.

Great, that answers my question.

@oxarbitrage @upbqdn
add doc suggestions
4d0ed95 
Co-authored-by: Marek <mail@marek.onl>
@teor2345
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Mar 21, 2023

update

✅ Branch has been successfully updated

mergify bot added a commit that referenced this pull request Mar 21, 2023
@mergify
Merge of #6346
1e1187c
@mergify mergify bot mentioned this pull request Mar 21, 2023
Closed
mergify bot added a commit that referenced this pull request Mar 22, 2023
@mergify
Merge of #6346
7d185de
@mergify mergify bot mentioned this pull request Mar 22, 2023
Closed
@mergify mergify bot merged commit d06b0b1 into main Mar 22, 2023
@mergify mergify bot deleted the dependabot/cargo/bitflags-2.0.1 branch March 22, 2023 02:49
@oxarbitrage oxarbitrage mentioned this pull request Mar 23, 2023
Merged
36 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@upbqdn upbqdn upbqdn approved these changes

@teor2345 teor2345 teor2345 approved these changes

Assignees

@oxarbitrage oxarbitrage

Labels
A-dependencies Area: Dependency file updates A-rust Area: Updates to Rust code C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@oxarbitrage @teor2345 @upbqdn