Skip to content

Commit 6b6517c

Browse files
Bump proptest from 1.8.0 to 1.10.0 (#796)
* Bump proptest from 1.8.0 to 1.10.0 Bumps [proptest](https://github.com/proptest-rs/proptest) from 1.8.0 to 1.10.0. - [Release notes](https://github.com/proptest-rs/proptest/releases) - [Changelog](https://github.com/proptest-rs/proptest/blob/main/CHANGELOG.md) - [Commits](proptest-rs/proptest@v1.8.0...v1.10.0) --- updated-dependencies: - dependency-name: proptest dependency-version: 1.10.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update UI test expected outputs for Rust 1.84 Remove ', which is required by ...' suffix from error messages that Rust 1.84 no longer includes in this specific error context. * Upgrade CI image to Rust 1.84.0 for proptest 1.10.0 compatibility * Fixes * Forgot --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bastian Köcher <info@kchr.de>
1 parent 3a22421 commit 6b6517c

File tree

9 files changed

+24
-26
lines changed

9 files changed

+24
-26
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88

99
env:
10-
IMAGE: paritytech/ci-unified:bullseye-1.81.0
10+
IMAGE: paritytech/ci-unified:bullseye-1.84.0
1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1313
cancel-in-progress: true

Cargo.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ criterion = "0.7.0"
2727
serde_derive = { version = "1.0" }
2828
parity-scale-codec-derive = { path = "derive", default-features = false }
2929
quickcheck = "1.0"
30-
proptest = "1.8.0"
30+
proptest = "1.10.0"
3131
trybuild = "1.0.115"
3232
paste = "1"
3333
rustversion = "1.0.6"

derive/src/trait_bounds.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct ContainIdents<'a> {
2929
idents: &'a [Ident],
3030
}
3131

32-
impl<'a, 'ast> Visit<'ast> for ContainIdents<'a> {
32+
impl<'ast> Visit<'ast> for ContainIdents<'_> {
3333
fn visit_ident(&mut self, i: &'ast Ident) {
3434
if self.idents.iter().any(|id| id == i) {
3535
self.result = true;
@@ -50,7 +50,7 @@ struct TypePathStartsWithIdent<'a> {
5050
ident: &'a Ident,
5151
}
5252

53-
impl<'a, 'ast> Visit<'ast> for TypePathStartsWithIdent<'a> {
53+
impl<'ast> Visit<'ast> for TypePathStartsWithIdent<'_> {
5454
fn visit_type_path(&mut self, i: &'ast TypePath) {
5555
if let Some(segment) = i.path.segments.first() {
5656
if &segment.ident == self.ident {
@@ -85,7 +85,7 @@ struct FindTypePathsNotStartOrContainIdent<'a> {
8585
ident: &'a Ident,
8686
}
8787

88-
impl<'a, 'ast> Visit<'ast> for FindTypePathsNotStartOrContainIdent<'a> {
88+
impl<'ast> Visit<'ast> for FindTypePathsNotStartOrContainIdent<'_> {
8989
fn visit_type_path(&mut self, i: &'ast TypePath) {
9090
if type_path_or_sub_starts_with_ident(i, self.ident) {
9191
visit::visit_type_path(self, i);

derive/src/utils.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -449,15 +449,15 @@ fn check_field_attribute(attr: &Attribute) -> syn::Result<()> {
449449
return Err(syn::Error::new(attr.meta.span(), field_error));
450450
}
451451
match nested.first().expect("Just checked that there is one item; qed") {
452-
Meta::Path(path) if path.get_ident().map_or(false, |i| i == "skip") => Ok(()),
452+
Meta::Path(path) if path.get_ident().is_some_and(|i| i == "skip") => Ok(()),
453453

454-
Meta::Path(path) if path.get_ident().map_or(false, |i| i == "compact") => Ok(()),
454+
Meta::Path(path) if path.get_ident().is_some_and(|i| i == "compact") => Ok(()),
455455

456456
Meta::NameValue(MetaNameValue {
457457
path,
458458
value: Expr::Lit(ExprLit { lit: Lit::Str(lit_str), .. }),
459459
..
460-
}) if path.get_ident().map_or(false, |i| i == "encoded_as") =>
460+
}) if path.get_ident().is_some_and(|i| i == "encoded_as") =>
461461
TokenStream::from_str(&lit_str.value())
462462
.map(|_| ())
463463
.map_err(|_e| syn::Error::new(lit_str.span(), "Invalid token stream")),
@@ -482,13 +482,13 @@ fn check_variant_attribute(attr: &Attribute) -> syn::Result<()> {
482482
return Err(syn::Error::new(attr.meta.span(), variant_error));
483483
}
484484
match nested.first().expect("Just checked that there is one item; qed") {
485-
Meta::Path(path) if path.get_ident().map_or(false, |i| i == "skip") => Ok(()),
485+
Meta::Path(path) if path.get_ident().is_some_and(|i| i == "skip") => Ok(()),
486486

487487
Meta::NameValue(MetaNameValue {
488488
path,
489489
value: Expr::Lit(ExprLit { lit: Lit::Int(_), .. }),
490490
..
491-
}) if path.get_ident().map_or(false, |i| i == "index") => Ok(()),
491+
}) if path.get_ident().is_some_and(|i| i == "index") => Ok(()),
492492

493493
elt => Err(syn::Error::new(elt.span(), variant_error)),
494494
}
@@ -516,8 +516,7 @@ fn check_top_attribute(attr: &Attribute) -> syn::Result<()> {
516516
return Err(syn::Error::new(attr.meta.span(), top_error));
517517
}
518518
match nested.first().expect("Just checked that there is one item; qed") {
519-
Meta::Path(path) if path.get_ident().map_or(false, |i| i == "dumb_trait_bound") =>
520-
Ok(()),
519+
Meta::Path(path) if path.get_ident().is_some_and(|i| i == "dumb_trait_bound") => Ok(()),
521520

522521
elt => Err(syn::Error::new(elt.span(), top_error)),
523522
}

tests/max_encoded_len_ui/crate_str.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
88
--> tests/max_encoded_len_ui/crate_str.rs:5:8
99
|
1010
5 | struct Example;
11-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
11+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
1212
|
1313
= help: the following other types implement trait `WrapperTypeEncode`:
1414
&T
@@ -31,7 +31,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
3131
--> tests/max_encoded_len_ui/crate_str.rs:8:10
3232
|
3333
8 | let _ = Example::max_encoded_len();
34-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
34+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
3535
|
3636
= help: the following other types implement trait `WrapperTypeEncode`:
3737
&T

tests/max_encoded_len_ui/incomplete_attr.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
88
--> tests/max_encoded_len_ui/incomplete_attr.rs:5:8
99
|
1010
5 | struct Example;
11-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
11+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
1212
|
1313
= help: the following other types implement trait `WrapperTypeEncode`:
1414
&T
@@ -31,7 +31,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
3131
--> tests/max_encoded_len_ui/incomplete_attr.rs:8:10
3232
|
3333
8 | let _ = Example::max_encoded_len();
34-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
34+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
3535
|
3636
= help: the following other types implement trait `WrapperTypeEncode`:
3737
&T

tests/max_encoded_len_ui/missing_crate_specifier.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
88
--> tests/max_encoded_len_ui/missing_crate_specifier.rs:5:8
99
|
1010
5 | struct Example;
11-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
11+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
1212
|
1313
= help: the following other types implement trait `WrapperTypeEncode`:
1414
&T
@@ -31,7 +31,7 @@ error[E0277]: the trait bound `Example: Encode` is not satisfied
3131
--> tests/max_encoded_len_ui/missing_crate_specifier.rs:8:10
3232
|
3333
8 | let _ = Example::max_encoded_len();
34-
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`, which is required by `Example: Encode`
34+
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Example`
3535
|
3636
= help: the following other types implement trait `WrapperTypeEncode`:
3737
&T

tests/max_encoded_len_ui/not_encode.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `NotEncode: Encode` is not satisfied
22
--> tests/max_encoded_len_ui/not_encode.rs:4:8
33
|
44
4 | struct NotEncode;
5-
| ^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NotEncode`, which is required by `NotEncode: Encode`
5+
| ^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NotEncode`
66
|
77
= help: the following other types implement trait `WrapperTypeEncode`:
88
&T

0 commit comments

Comments
 (0)