From e8b42edfc1e8dd3024b13886e74dffb7521dd454 Mon Sep 17 00:00:00 2001 From: Anders429 Date: Tue, 17 Dec 2024 22:07:31 -0700 Subject: [PATCH 1/3] Remove code coverage. --- .github/workflows/test.yaml | 14 -------------- README.md | 1 - 2 files changed, 15 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d48254e..c40158f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -87,17 +87,3 @@ jobs: - uses: dtolnay/rust-toolchain@nightly - run: curl -LsSf https://github.com/foresterre/cargo-msrv/releases/latest/download/cargo-msrv_v0.15.1_Linux_x86_64.tar | tar xf - -C ~/.cargo/bin - run: cargo msrv --verify - - codecov: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly - with: - components: llvm-tools-preview - - run: curl -LsSf https://github.com/taiki-e/cargo-llvm-cov/releases/latest/download/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin - - run: cargo llvm-cov --all-features --lcov --output-path lcov.info - - uses: codecov/codecov-action@v3 - with: - files: lcov.info - fail_ci_if_error: true diff --git a/README.md b/README.md index 4b2fca8..6ba8611 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # serde_assert [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/Anders429/serde_assert/test.yaml?branch=master)](https://github.com/Anders429/serde_assert/actions/workflows/test.yaml) -[![codecov.io](https://img.shields.io/codecov/c/gh/Anders429/serde_assert)](https://codecov.io/gh/Anders429/serde_assert) [![crates.io](https://img.shields.io/crates/v/serde_assert)](https://crates.io/crates/serde_assert) [![docs.rs](https://docs.rs/serde_assert/badge.svg)](https://docs.rs/serde_assert) [![MSRV](https://img.shields.io/badge/rustc-1.56.0+-yellow.svg)](#minimum-supported-rust-version) From e805808f2e0a38cbf6d122766ca3c1d26975a362 Mon Sep 17 00:00:00 2001 From: Anders429 Date: Wed, 18 Dec 2024 12:37:57 -0700 Subject: [PATCH 2/3] Fix MSRV check. --- .github/workflows/test.yaml | 9 +++++---- Cargo.toml | 2 +- README.md | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c40158f..664fdea 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 + - 1.61.0 - stable - beta - nightly @@ -33,7 +33,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 + - 1.61.0 - stable - beta - nightly @@ -85,5 +85,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - - run: curl -LsSf https://github.com/foresterre/cargo-msrv/releases/latest/download/cargo-msrv_v0.15.1_Linux_x86_64.tar | tar xf - -C ~/.cargo/bin - - run: cargo msrv --verify + - run: curl -LsSf https://github.com/foresterre/cargo-msrv/releases/download/v0.17.1/cargo-msrv-x86_64-unknown-linux-gnu-v0.17.1.tgz | tar zxvf - -C ~/.cargo/bin + - run: mv ~/.cargo/bin/cargo-msrv-x86_64-unknown-linux-gnu-v0.17.1/cargo-msrv ~/.cargo/bin/cargo-msrv + - run: cargo msrv verify diff --git a/Cargo.toml b/Cargo.toml index 8709fbf..3bc91bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "serde_assert" version = "0.8.0" authors = ["Anders Evensen"] edition = "2021" -rust-version = "1.56.0" +rust-version = "1.61.0" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/Anders429/serde_assert" diff --git a/README.md b/README.md index 6ba8611..921e514 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/Anders429/serde_assert/test.yaml?branch=master)](https://github.com/Anders429/serde_assert/actions/workflows/test.yaml) [![crates.io](https://img.shields.io/crates/v/serde_assert)](https://crates.io/crates/serde_assert) [![docs.rs](https://docs.rs/serde_assert/badge.svg)](https://docs.rs/serde_assert) -[![MSRV](https://img.shields.io/badge/rustc-1.56.0+-yellow.svg)](#minimum-supported-rust-version) +[![MSRV](https://img.shields.io/badge/rustc-1.61.0+-yellow.svg)](#minimum-supported-rust-version) [![License](https://img.shields.io/crates/l/serde_assert)](#license) Testing library for [`serde`](https://crates.io/crates/serde) [`Serialize`](https://docs.rs/serde/latest/serde/trait.Serialize.html) and [`Deserialize`](https://docs.rs/serde/latest/serde/trait.Deserialize.html) implementations. @@ -55,7 +55,7 @@ While some users may find that the smaller API of `serde_test` is sufficient for - Sophisticated comparison of serialized [`Token`](https://docs.rs/serde_assert/latest/serde_assert/struct.Token.html) sequences, including allowing testing of types whose serialized form can include items in arbitrary order, such as when serializing a [`HashSet`](https://docs.rs/hashbrown/latest/hashbrown/struct.HashSet.html). ## Minimum Supported Rust Version -This crate is guaranteed to compile on stable `rustc 1.56.0` and up. +This crate is guaranteed to compile on stable `rustc 1.61.0` and up. ## License This project is licensed under either of From f4aa284a0f7c2a9cc89f1d3cd4d91673c24bf734 Mon Sep 17 00:00:00 2001 From: Anders429 Date: Wed, 18 Dec 2024 12:40:22 -0700 Subject: [PATCH 3/3] Fix clippy lints. --- src/de.rs | 102 +++++++++++++++---------------- src/token.rs | 166 +++++++++++++++++++++++++-------------------------- 2 files changed, 134 insertions(+), 134 deletions(-) diff --git a/src/de.rs b/src/de.rs index e2f33d9..20877e9 100644 --- a/src/de.rs +++ b/src/de.rs @@ -98,7 +98,7 @@ pub struct Deserializer<'a> { zero_copy: bool, } -impl<'a, 'de> de::Deserializer<'de> for &'a mut Deserializer<'de> { +impl<'de> de::Deserializer<'de> for &mut Deserializer<'de> { type Error = Error; fn deserialize_any(self, visitor: V) -> Result @@ -777,7 +777,7 @@ struct SeqAccess<'a, 'b> { ended: bool, } -impl<'a, 'de> de::SeqAccess<'de> for SeqAccess<'a, 'de> { +impl<'de> de::SeqAccess<'de> for SeqAccess<'_, 'de> { type Error = Error; fn next_element_seed(&mut self, seed: T) -> Result, Self::Error> @@ -820,7 +820,7 @@ struct MapAccess<'a, 'b> { ended: bool, } -impl<'a, 'de> de::MapAccess<'de> for MapAccess<'a, 'de> { +impl<'de> de::MapAccess<'de> for MapAccess<'_, 'de> { type Error = Error; fn next_key_seed(&mut self, seed: K) -> Result, Self::Error> @@ -889,7 +889,7 @@ struct VariantAccess<'a, 'b> { deserializer: &'a mut Deserializer<'b>, } -impl<'a, 'de> de::VariantAccess<'de> for VariantAccess<'a, 'de> { +impl<'de> de::VariantAccess<'de> for VariantAccess<'_, 'de> { type Error = Error; fn unit_variant(self) -> Result<(), Self::Error> { @@ -944,7 +944,7 @@ struct EnumDeserializer<'a, 'b> { deserializer: &'a mut Deserializer<'b>, } -impl<'a, 'de> de::Deserializer<'de> for EnumDeserializer<'a, 'de> { +impl<'de> de::Deserializer<'de> for EnumDeserializer<'_, 'de> { type Error = Error; fn deserialize_any(self, visitor: V) -> Result @@ -1483,13 +1483,13 @@ impl Display for Error { Self::UnsupportedEnumDeserializerMethod => f.write_str("use of unsupported enum deserializer method"), Self::NotSelfDescribing => f.write_str("attempted to deserialize as self-describing when deserializer is not set as self-describing"), Self::Custom(s) => f.write_str(s), - Self::InvalidType(unexpected, expected) => write!(f, "invalid type: expected {}, found {}", expected, unexpected), - Self::InvalidValue(unexpected, expected) => write!(f, "invalid value: expected {}, found {}", expected, unexpected), - Self::InvalidLength(length, expected) => write!(f, "invalid length {}, expected {}", length, expected), - Self::UnknownVariant(variant, expected) => write!(f, "unknown variant {}, expected one of {:?}", variant, expected), - Self::UnknownField(field, expected) => write!(f, "unknown field {}, expected one of {:?}", field, expected), - Self::MissingField(field) => write!(f, "missing field {}", field), - Self::DuplicateField(field) => write!(f, "duplicate field {}", field), + Self::InvalidType(unexpected, expected) => write!(f, "invalid type: expected {expected}, found {unexpected}"), + Self::InvalidValue(unexpected, expected) => write!(f, "invalid value: expected {expected}, found {unexpected}"), + Self::InvalidLength(length, expected) => write!(f, "invalid length {length}, expected {expected}"), + Self::UnknownVariant(variant, expected) => write!(f, "unknown variant {variant}, expected one of {expected:?}"), + Self::UnknownField(field, expected) => write!(f, "unknown field {field}, expected one of {expected:?}"), + Self::MissingField(field) => write!(f, "missing field {field}"), + Self::DuplicateField(field) => write!(f, "duplicate field {field}"), } } } @@ -1771,7 +1771,7 @@ mod tests { { struct VariantVisitor; - impl<'de> Visitor<'de> for VariantVisitor { + impl Visitor<'_> for VariantVisitor { type Value = Variant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -1870,7 +1870,7 @@ mod tests { { struct FieldVisitor; - impl<'de> Visitor<'de> for FieldVisitor { + impl Visitor<'_> for FieldVisitor { type Value = Field; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -2670,7 +2670,7 @@ mod tests { { struct StrVisitor; - impl<'de> Visitor<'de> for StrVisitor { + impl Visitor<'_> for StrVisitor { type Value = Str; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -2796,7 +2796,7 @@ mod tests { { struct BytesVisitor; - impl<'de> Visitor<'de> for BytesVisitor { + impl Visitor<'_> for BytesVisitor { type Value = Bytes; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -2972,7 +2972,7 @@ mod tests { { struct UnitVisitor; - impl<'de> Visitor<'de> for UnitVisitor { + impl Visitor<'_> for UnitVisitor { type Value = Unit; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -3830,7 +3830,7 @@ mod tests { { struct IdentifierVisitor; - impl<'de> Visitor<'de> for IdentifierVisitor { + impl Visitor<'_> for IdentifierVisitor { type Value = Identifier; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -3962,7 +3962,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4094,7 +4094,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4131,7 +4131,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4184,7 +4184,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4237,7 +4237,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4290,7 +4290,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4343,7 +4343,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4396,7 +4396,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4449,7 +4449,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4503,7 +4503,7 @@ mod tests { { struct U32EnumVariantVisitor; - impl<'de> Visitor<'de> for U32EnumVariantVisitor { + impl Visitor<'_> for U32EnumVariantVisitor { type Value = U32EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4637,7 +4637,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4690,7 +4690,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4741,7 +4741,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4776,7 +4776,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4811,7 +4811,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4848,7 +4848,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4900,7 +4900,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4950,7 +4950,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -4985,7 +4985,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5020,7 +5020,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5055,7 +5055,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5090,7 +5090,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5125,7 +5125,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5160,7 +5160,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5195,7 +5195,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5230,7 +5230,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5265,7 +5265,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5300,7 +5300,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5337,7 +5337,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5389,7 +5389,7 @@ mod tests { { struct EnumVariantVisitor; - impl<'de> Visitor<'de> for EnumVariantVisitor { + impl Visitor<'_> for EnumVariantVisitor { type Value = EnumVariant; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -5435,7 +5435,7 @@ mod tests { deserializer: &mut deserializer, }; - assert!(enum_deserializer.is_human_readable()) + assert!(enum_deserializer.is_human_readable()); } #[test] @@ -5445,7 +5445,7 @@ mod tests { deserializer: &mut deserializer, }; - assert!(enum_deserializer.is_human_readable()) + assert!(enum_deserializer.is_human_readable()); } #[test] @@ -5455,7 +5455,7 @@ mod tests { deserializer: &mut deserializer, }; - assert!(!enum_deserializer.is_human_readable()) + assert!(!enum_deserializer.is_human_readable()); } #[test] diff --git a/src/token.rs b/src/token.rs index d5d06db..6724126 100644 --- a/src/token.rs +++ b/src/token.rs @@ -1807,72 +1807,72 @@ mod tests { #[test] fn token_from_canonical_token_bool() { - assert_matches!(Token::from(CanonicalToken::Bool(true)), Token::Bool(true)) + assert_matches!(Token::from(CanonicalToken::Bool(true)), Token::Bool(true)); } #[test] fn token_from_canonical_token_i8() { - assert_matches!(Token::from(CanonicalToken::I8(42)), Token::I8(42)) + assert_matches!(Token::from(CanonicalToken::I8(42)), Token::I8(42)); } #[test] fn token_from_canonical_token_i16() { - assert_matches!(Token::from(CanonicalToken::I16(42)), Token::I16(42)) + assert_matches!(Token::from(CanonicalToken::I16(42)), Token::I16(42)); } #[test] fn token_from_canonical_token_i32() { - assert_matches!(Token::from(CanonicalToken::I32(42)), Token::I32(42)) + assert_matches!(Token::from(CanonicalToken::I32(42)), Token::I32(42)); } #[test] fn token_from_canonical_token_i64() { - assert_matches!(Token::from(CanonicalToken::I64(42)), Token::I64(42)) + assert_matches!(Token::from(CanonicalToken::I64(42)), Token::I64(42)); } #[test] fn token_from_canonical_token_i128() { - assert_matches!(Token::from(CanonicalToken::I128(42)), Token::I128(42)) + assert_matches!(Token::from(CanonicalToken::I128(42)), Token::I128(42)); } #[test] fn token_from_canonical_token_u8() { - assert_matches!(Token::from(CanonicalToken::U8(42)), Token::U8(42)) + assert_matches!(Token::from(CanonicalToken::U8(42)), Token::U8(42)); } #[test] fn token_from_canonical_token_u16() { - assert_matches!(Token::from(CanonicalToken::U16(42)), Token::U16(42)) + assert_matches!(Token::from(CanonicalToken::U16(42)), Token::U16(42)); } #[test] fn token_from_canonical_token_u32() { - assert_matches!(Token::from(CanonicalToken::U32(42)), Token::U32(42)) + assert_matches!(Token::from(CanonicalToken::U32(42)), Token::U32(42)); } #[test] fn token_from_canonical_token_u64() { - assert_matches!(Token::from(CanonicalToken::U64(42)), Token::U64(42)) + assert_matches!(Token::from(CanonicalToken::U64(42)), Token::U64(42)); } #[test] fn token_from_canonical_token_u128() { - assert_matches!(Token::from(CanonicalToken::U128(42)), Token::U128(42)) + assert_matches!(Token::from(CanonicalToken::U128(42)), Token::U128(42)); } #[test] fn token_from_canonical_token_f32() { - assert_matches!(Token::from(CanonicalToken::F32(42.9)), Token::F32(_)) + assert_matches!(Token::from(CanonicalToken::F32(42.9)), Token::F32(_)); } #[test] fn token_from_canonical_token_f64() { - assert_matches!(Token::from(CanonicalToken::F64(42.9)), Token::F64(_)) + assert_matches!(Token::from(CanonicalToken::F64(42.9)), Token::F64(_)); } #[test] fn token_from_canonical_token_char() { - assert_matches!(Token::from(CanonicalToken::Char('a')), Token::Char('a')) + assert_matches!(Token::from(CanonicalToken::Char('a')), Token::Char('a')); } #[test] @@ -1880,7 +1880,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Str("foo".to_owned())), Token::Str(_) - ) + ); } #[test] @@ -1888,22 +1888,22 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Bytes(b"foo".to_vec())), Token::Bytes(_) - ) + ); } #[test] fn token_from_canonical_token_none() { - assert_matches!(Token::from(CanonicalToken::None), Token::None) + assert_matches!(Token::from(CanonicalToken::None), Token::None); } #[test] fn token_from_canonical_token_some() { - assert_matches!(Token::from(CanonicalToken::Some), Token::Some) + assert_matches!(Token::from(CanonicalToken::Some), Token::Some); } #[test] fn token_from_canonical_token_unit() { - assert_matches!(Token::from(CanonicalToken::Unit), Token::Unit) + assert_matches!(Token::from(CanonicalToken::Unit), Token::Unit); } #[test] @@ -1911,7 +1911,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::UnitStruct { name: "foo" }), Token::UnitStruct { name: "foo" } - ) + ); } #[test] @@ -1927,7 +1927,7 @@ mod tests { variant_index: 42, variant: "bar" } - ) + ); } #[test] @@ -1935,7 +1935,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::NewtypeStruct { name: "foo" }), Token::NewtypeStruct { name: "foo" } - ) + ); } #[test] @@ -1951,7 +1951,7 @@ mod tests { variant_index: 42, variant: "bar" } - ) + ); } #[test] @@ -1959,12 +1959,12 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Seq { len: Some(42) }), Token::Seq { len: Some(42) } - ) + ); } #[test] fn token_from_canonical_token_seq_end() { - assert_matches!(Token::from(CanonicalToken::SeqEnd), Token::SeqEnd) + assert_matches!(Token::from(CanonicalToken::SeqEnd), Token::SeqEnd); } #[test] @@ -1972,12 +1972,12 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Tuple { len: 42 }), Token::Tuple { len: 42 } - ) + ); } #[test] fn token_from_canonical_token_tuple_end() { - assert_matches!(Token::from(CanonicalToken::TupleEnd), Token::TupleEnd) + assert_matches!(Token::from(CanonicalToken::TupleEnd), Token::TupleEnd); } #[test] @@ -1991,7 +1991,7 @@ mod tests { name: "foo", len: 42 } - ) + ); } #[test] @@ -1999,7 +1999,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::TupleStructEnd), Token::TupleStructEnd - ) + ); } #[test] @@ -2017,7 +2017,7 @@ mod tests { variant: "bar", len: 42 } - ) + ); } #[test] @@ -2025,7 +2025,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::TupleVariantEnd), Token::TupleVariantEnd - ) + ); } #[test] @@ -2033,12 +2033,12 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Map { len: Some(42) }), Token::Map { len: Some(42) } - ) + ); } #[test] fn token_from_canonical_token_map_end() { - assert_matches!(Token::from(CanonicalToken::MapEnd), Token::MapEnd) + assert_matches!(Token::from(CanonicalToken::MapEnd), Token::MapEnd); } #[test] @@ -2046,7 +2046,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::Field("foo")), Token::Field("foo") - ) + ); } #[test] @@ -2054,7 +2054,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::SkippedField("foo")), Token::SkippedField("foo") - ) + ); } #[test] @@ -2068,12 +2068,12 @@ mod tests { name: "foo", len: 42 } - ) + ); } #[test] fn token_from_canonical_token_struct_end() { - assert_matches!(Token::from(CanonicalToken::StructEnd), Token::StructEnd) + assert_matches!(Token::from(CanonicalToken::StructEnd), Token::StructEnd); } #[test] @@ -2091,7 +2091,7 @@ mod tests { variant: "bar", len: 42 } - ) + ); } #[test] @@ -2099,7 +2099,7 @@ mod tests { assert_matches!( Token::from(CanonicalToken::StructVariantEnd), Token::StructVariantEnd - ) + ); } #[test] @@ -2107,7 +2107,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Bool(true)), Unexpected::Bool(true) - ) + ); } #[test] @@ -2115,7 +2115,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::I8(42)), Unexpected::Signed(42) - ) + ); } #[test] @@ -2123,7 +2123,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::I16(42)), Unexpected::Signed(42) - ) + ); } #[test] @@ -2131,7 +2131,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::I32(42)), Unexpected::Signed(42) - ) + ); } #[test] @@ -2139,7 +2139,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::I64(42)), Unexpected::Signed(42) - ) + ); } #[test] @@ -2147,7 +2147,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::I128(42)), Unexpected::Other("i128") - ) + ); } #[test] @@ -2155,7 +2155,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::U8(42)), Unexpected::Unsigned(42) - ) + ); } #[test] @@ -2163,7 +2163,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::U16(42)), Unexpected::Unsigned(42) - ) + ); } #[test] @@ -2171,7 +2171,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::U32(42)), Unexpected::Unsigned(42) - ) + ); } #[test] @@ -2179,7 +2179,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::U64(42)), Unexpected::Unsigned(42) - ) + ); } #[test] @@ -2187,7 +2187,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::U128(42)), Unexpected::Other("u128") - ) + ); } #[test] @@ -2195,7 +2195,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::F32(42.)), Unexpected::Float(42.) - ) + ); } #[test] @@ -2203,7 +2203,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::F64(42.)), Unexpected::Float(42.) - ) + ); } #[test] @@ -2211,7 +2211,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Char('a')), Unexpected::Char('a') - ) + ); } #[test] @@ -2219,7 +2219,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Str("foo".to_owned())), Unexpected::Str("foo") - ) + ); } #[test] @@ -2227,7 +2227,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Bytes(b"foo".to_vec())), Unexpected::Bytes(b"foo") - ) + ); } #[test] @@ -2235,7 +2235,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Some), Unexpected::Option - ) + ); } #[test] @@ -2243,7 +2243,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::None), Unexpected::Option - ) + ); } #[test] @@ -2251,7 +2251,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Unit), Unexpected::Unit - ) + ); } #[test] @@ -2259,7 +2259,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::UnitStruct { name: "foo" }), Unexpected::Unit - ) + ); } #[test] @@ -2271,7 +2271,7 @@ mod tests { variant: "bar" }), Unexpected::UnitVariant - ) + ); } #[test] @@ -2279,7 +2279,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::NewtypeStruct { name: "foo" }), Unexpected::NewtypeStruct - ) + ); } #[test] @@ -2291,7 +2291,7 @@ mod tests { variant: "bar" }), Unexpected::NewtypeVariant - ) + ); } #[test] @@ -2299,7 +2299,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Seq { len: None }), Unexpected::Seq - ) + ); } #[test] @@ -2307,7 +2307,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Tuple { len: 0 }), Unexpected::Seq - ) + ); } #[test] @@ -2315,7 +2315,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::SeqEnd), Unexpected::Other("SeqEnd") - ) + ); } #[test] @@ -2323,7 +2323,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::TupleEnd), Unexpected::Other("TupleEnd") - ) + ); } #[test] @@ -2334,7 +2334,7 @@ mod tests { len: 0 }), Unexpected::Other("TupleStruct") - ) + ); } #[test] @@ -2342,7 +2342,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::TupleStructEnd), Unexpected::Other("TupleStructEnd") - ) + ); } #[test] @@ -2355,7 +2355,7 @@ mod tests { len: 0 }), Unexpected::TupleVariant - ) + ); } #[test] @@ -2363,7 +2363,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::TupleVariantEnd), Unexpected::Other("TupleVariantEnd") - ) + ); } #[test] @@ -2371,7 +2371,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Map { len: None }), Unexpected::Map - ) + ); } #[test] @@ -2379,7 +2379,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::MapEnd), Unexpected::Other("MapEnd") - ) + ); } #[test] @@ -2387,7 +2387,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::Field("foo")), Unexpected::Other("Field") - ) + ); } #[test] @@ -2395,7 +2395,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::SkippedField("foo")), Unexpected::Other("SkippedField") - ) + ); } #[test] @@ -2406,7 +2406,7 @@ mod tests { len: 0 }), Unexpected::Other("Struct") - ) + ); } #[test] @@ -2414,7 +2414,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::StructEnd), Unexpected::Other("StructEnd") - ) + ); } #[test] @@ -2427,7 +2427,7 @@ mod tests { len: 0 }), Unexpected::StructVariant - ) + ); } #[test] @@ -2435,7 +2435,7 @@ mod tests { assert_eq!( Unexpected::from(&mut CanonicalToken::StructVariantEnd), Unexpected::Other("StructVariantEnd") - ) + ); } #[test] @@ -2471,7 +2471,7 @@ mod tests { fn owning_iter_empty_debug() { let iter = OwningIter::new(Tokens(Vec::new())); - assert_eq!(format!("{:?}", iter), "OwningIter([])") + assert_eq!(format!("{iter:?}"), "OwningIter([])"); } #[test] @@ -2483,9 +2483,9 @@ mod tests { ])); assert_eq!( - format!("{:?}", iter), + format!("{iter:?}"), "OwningIter([Bool(true), U64(42), Str(\"foo\")])" - ) + ); } #[test] @@ -2498,7 +2498,7 @@ mod tests { assert_some!(iter.next()); - assert_eq!(format!("{:?}", iter), "OwningIter([U64(42), Str(\"foo\")])") + assert_eq!(format!("{iter:?}"), "OwningIter([U64(42), Str(\"foo\")])"); } #[test] @@ -2513,6 +2513,6 @@ mod tests { assert_some!(iter.next()); assert_some!(iter.next()); - assert_eq!(format!("{:?}", iter), "OwningIter([])") + assert_eq!(format!("{iter:?}"), "OwningIter([])"); } }