From d7b31d67d37188395c5d63eb6a0490d30afd5f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D1=85=D0=B0=D1=80=D0=BE=D0=B2=20=D0=90=D0=BD?= =?UTF-8?q?=D0=B4=D1=80=D0=B5=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87?= Date: Sat, 11 Jan 2025 16:53:28 +0300 Subject: [PATCH 1/3] bump a thiserror version --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c77dc1b..c71a25b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "simple_asn1" -version = "0.6.2" +version = "0.6.3" authors = ["Adam Wick "] description = "A simple DER/ASN.1 encoding/decoding library." categories = ["encoding"] @@ -12,7 +12,7 @@ edition = "2018" [dependencies] num-bigint = { default-features = false, version = "0.4" } num-traits = { default-features = false, version = "0.2" } -thiserror = { default-features = false, version = "1" } +thiserror = { default-features = false, version = "2" } time = { default-features = false, version = "0.3", features = ["formatting", "macros", "parsing"] } [dev-dependencies] -- 2.53.0 From 6043fc6d6a798b9c28dbe0e2f902fa00953b51a8 Mon Sep 17 00:00:00 2001 From: Adam Wick Date: Sun, 12 Jan 2025 13:41:37 -0800 Subject: [PATCH 2/3] Clean up some new warnings re parentheses. --- src/lib.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 3d990d3..80afd71 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -152,34 +152,34 @@ impl ASN1Block { impl PartialEq for ASN1Block { fn eq(&self, other: &ASN1Block) -> bool { match (self, other) { - (&ASN1Block::Boolean(_, a1), &ASN1Block::Boolean(_, a2)) => (a1 == a2), - (&ASN1Block::Integer(_, ref a1), &ASN1Block::Integer(_, ref a2)) => (a1 == a2), + (&ASN1Block::Boolean(_, a1), &ASN1Block::Boolean(_, a2)) => a1 == a2, + (&ASN1Block::Integer(_, ref a1), &ASN1Block::Integer(_, ref a2)) => a1 == a2, (&ASN1Block::BitString(_, a1, ref b1), &ASN1Block::BitString(_, a2, ref b2)) => { (a1 == a2) && (b1 == b2) } - (&ASN1Block::OctetString(_, ref a1), &ASN1Block::OctetString(_, ref a2)) => (a1 == a2), + (&ASN1Block::OctetString(_, ref a1), &ASN1Block::OctetString(_, ref a2)) => a1 == a2, (&ASN1Block::Null(_), &ASN1Block::Null(_)) => true, (&ASN1Block::ObjectIdentifier(_, ref a1), &ASN1Block::ObjectIdentifier(_, ref a2)) => { a1 == a2 } - (&ASN1Block::UTF8String(_, ref a1), &ASN1Block::UTF8String(_, ref a2)) => (a1 == a2), + (&ASN1Block::UTF8String(_, ref a1), &ASN1Block::UTF8String(_, ref a2)) => a1 == a2, (&ASN1Block::PrintableString(_, ref a1), &ASN1Block::PrintableString(_, ref a2)) => { a1 == a2 } (&ASN1Block::TeletexString(_, ref a1), &ASN1Block::TeletexString(_, ref a2)) => { a1 == a2 } - (&ASN1Block::IA5String(_, ref a1), &ASN1Block::IA5String(_, ref a2)) => (a1 == a2), - (&ASN1Block::UTCTime(_, ref a1), &ASN1Block::UTCTime(_, ref a2)) => (a1 == a2), + (&ASN1Block::IA5String(_, ref a1), &ASN1Block::IA5String(_, ref a2)) => a1 == a2, + (&ASN1Block::UTCTime(_, ref a1), &ASN1Block::UTCTime(_, ref a2)) => a1 == a2, (&ASN1Block::GeneralizedTime(_, ref a1), &ASN1Block::GeneralizedTime(_, ref a2)) => { a1 == a2 } (&ASN1Block::UniversalString(_, ref a1), &ASN1Block::UniversalString(_, ref a2)) => { a1 == a2 } - (&ASN1Block::BMPString(_, ref a1), &ASN1Block::BMPString(_, ref a2)) => (a1 == a2), - (&ASN1Block::Sequence(_, ref a1), &ASN1Block::Sequence(_, ref a2)) => (a1 == a2), - (&ASN1Block::Set(_, ref a1), &ASN1Block::Set(_, ref a2)) => (a1 == a2), + (&ASN1Block::BMPString(_, ref a1), &ASN1Block::BMPString(_, ref a2)) => a1 == a2, + (&ASN1Block::Sequence(_, ref a1), &ASN1Block::Sequence(_, ref a2)) => a1 == a2, + (&ASN1Block::Set(_, ref a1), &ASN1Block::Set(_, ref a2)) => a1 == a2, ( &ASN1Block::Explicit(a1, _, ref b1, ref c1), &ASN1Block::Explicit(a2, _, ref b2, ref c2), -- 2.53.0 From 05507c21990f4c61fa24b9d8679d660e4d72fd89 Mon Sep 17 00:00:00 2001 From: Adam Wick Date: Sun, 12 Jan 2025 13:43:06 -0800 Subject: [PATCH 3/3] Add some CI. --- .github/workflows/rust.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/rust.yml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml new file mode 100644 index 0000000..bd293e1 --- /dev/null +++ b/.github/workflows/rust.yml @@ -0,0 +1,33 @@ +name: Rust + +on: + push: + branches: [ "develop", "ci" ] + pull_request: + branches: [ "develop" ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + rust: [stable] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Install toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + default: true + override: true + - name: Format Check + run: cargo fmt --check + - name: Build + run: cargo build + - name: Run tests + run: cargo test -- 2.53.0