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.

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

build(deps): bump serde from 1.0.156 to 1.0.158 #6358

Merged
merged 2 commits into from
Mar 22, 2023

Conversation

dependabot[bot]
Copy link
Contributor

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

Bumps serde from 1.0.156 to 1.0.158.

Release notes

Sourced from serde's releases.

v1.0.158

  • Fix "expected serde crate attribute to be a string" error when using macro_rules metavariable inside of serde attribute: #[serde(crate = $serde_path)] (#2409)

v1.0.157

  • Update syn dependency to 2.x
Commits
  • e305810 Release 1.0.158
  • dc200a6 Reformat comments of non-public serde_derive internals
  • 2c0999a Merge pull request #2410 from serde-rs/attrvalue
  • dd460f8 Check for None-delimited group in attribute value
  • c3d637f Add regression test for issue 2409
  • 479a00a Release 1.0.157
  • c42e7c8 Reflect serde_derive required compiler in build script and rust-version metadata
  • 5b8e065 Ignore single_match_else pedantic clippy lint in serde_derive_internals
  • 9fc0d13 Merge pull request #2406 from dtolnay/nestedmeta
  • bc22641 Rewrite attribute parser using parse_nested_meta
  • 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 dependabot bot requested review from a team as code owners March 20, 2023 15:57
@dependabot dependabot bot removed the request for review from a team March 20, 2023 15:57
@dependabot dependabot bot added the A-dependencies Area: Dependency file updates label Mar 20, 2023
@dependabot dependabot bot requested a review from upbqdn March 20, 2023 15:57
@dependabot dependabot bot added 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 20, 2023
@codecov
Copy link

codecov bot commented Mar 20, 2023

Codecov Report

Merging #6358 (4a23f88) into main (ff54f86) will decrease coverage by 0.01%.
The diff coverage is 63.63%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6358      +/-   ##
==========================================
- Coverage   77.75%   77.74%   -0.01%     
==========================================
  Files         304      304              
  Lines       39583    39583              
==========================================
- Hits        30776    30773       -3     
- Misses       8807     8810       +3     

@dependabot dependabot bot force-pushed the dependabot/cargo/serde-1.0.158 branch 3 times, most recently from 6a08ec8 to 512c552 Compare March 21, 2023 23:21
@teor2345
Copy link
Contributor

teor2345 commented Mar 22, 2023

This upgrade causes a clippy warning in unrelated cryptographic code.

It's possible the underlying Rust version has been upgraded to generate this error, but I the last Rust stable release was a week or two ago.

    Checking zebra-chain v1.0.0-beta.21 (/home/runner/work/zebra/zebra/zebra-chain)
error: unnecessary braces around block return value
   --> zebra-chain/src/orchard/tree.rs:285:39
    |
285 |     inner: bridgetree::Frontier<Node, { MERKLE_DEPTH as u8 }>,
    |                                       ^^                  ^^

https://github.com/ZcashFoundation/zebra/actions/runs/4484731869/jobs/7885608533?pr=6358#step:8:25

@teor2345
Copy link
Contributor

This might be a diagnostics bug in the latest version of the serde_derive macros, usually macros disable warnings like this.

/// Sapling Incremental Note Commitment Tree.
#[derive(Debug, Serialize, Deserialize)]
pub struct NoteCommitmentTree {
/// The tree represented as a [`Frontier`](bridgetree::Frontier).
///
/// A Frontier is a subset of the tree that allows to fully specify it.
/// It consists of nodes along the rightmost (newer) branch of the tree that
/// has non-empty nodes. Upper (near root) empty nodes of the branch are not
/// stored.
///
/// # Consensus
///
/// > [Sapling onward] A block MUST NOT add Sapling note commitments that
/// > would result in the Sapling note commitment tree exceeding its capacity
/// > of 2^(MerkleDepth^Sapling) leaf nodes.
///
/// <https://zips.z.cash/protocol/protocol.pdf#merkletree>
///
/// Note: MerkleDepth^Sapling = MERKLE_DEPTH = 32.
inner: bridgetree::Frontier<Node, { MERKLE_DEPTH as u8 }>,

@dependabot dependabot bot force-pushed the dependabot/cargo/serde-1.0.158 branch 2 times, most recently from 262712f to fd1f9b9 Compare March 22, 2023 02:52
dependabot bot and others added 2 commits March 22, 2023 15:45
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.156 to 1.0.158.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.156...v1.0.158)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@teor2345 teor2345 force-pushed the dependabot/cargo/serde-1.0.158 branch from fd1f9b9 to 4a23f88 Compare March 22, 2023 06:39
@teor2345 teor2345 requested a review from a team as a code owner March 22, 2023 06:39
@teor2345
Copy link
Contributor

I did a minor refactor to our MERKLE_DEPTH constants to avoid the warning.

I'll need someone else to review.

@teor2345 teor2345 removed the request for review from a team March 22, 2023 06:41
@teor2345 teor2345 added the C-cleanup Category: This is a cleanup label Mar 22, 2023
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.

All looks good.

I tried to track down what exactly started causing the clippy issue, and I didn't find anything specific. Is it buried in this Rust bump from version 1.31 to 1.56? serde-rs/serde@c42e7c8

@upbqdn
Copy link
Member

upbqdn commented Mar 22, 2023

It's possible the underlying Rust version has been upgraded to generate this error, but I the last Rust stable release was a week or two ago.

When I think about it again, why would an underlying Rust version cause such an issue?

mergify bot added a commit that referenced this pull request Mar 22, 2023
@mergify mergify bot merged commit 45a96b5 into main Mar 22, 2023
@mergify mergify bot deleted the dependabot/cargo/serde-1.0.158 branch March 22, 2023 17:12
@teor2345
Copy link
Contributor

It's possible the underlying Rust version has been upgraded to generate this error, but I the last Rust stable release was a week or two ago.

When I think about it again, why would an underlying Rust version cause such an issue?

Because they refactored how those kinds of warnings are generated, and Generic Associated Types themselves are a new feature - the Rust repository has several bugs about the new implementation.

@oxarbitrage oxarbitrage mentioned this pull request Mar 23, 2023
36 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependencies Area: Dependency file updates A-rust Area: Updates to Rust code C-cleanup Category: This is a cleanup C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants