Fix up CI and update MSRV (#543)

Author: alex

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       matrix:
         RUST:
           # MSRV
-          - VERSION: "1.65.0"
+          - VERSION: "1.74.0"
             FLAGS: ""
 
           - VERSION: stable
@@ -86,18 +86,6 @@ jobs:
             target/
           key: ${{ runner.os }}-${{ matrix.RUST.VERSION }}-cargo-2-${{ hashFiles('**/Cargo.toml') }}
 
-      - run: |
-          cargo generate-lockfile
-          cargo update -p anstyle --precise 1.0.8
-          cargo update -p anstyle-parse --precise 0.2.5
-          cargo update -p anstyle-query --precise 1.1.1
-          cargo update -p clap --precise 4.3.24
-          cargo update -p clap_builder --precise 4.3.24
-          cargo update -p clap_lex --precise 0.5.0
-          cargo update -p colorchoice --precise 1.0.2
-          cargo update -p once_cell --precise 1.20.3
-        if: matrix.RUST.VERSION == '1.65.0'
-
       - run: cargo check --workspace --tests ${{ matrix.RUST.FLAGS }}
       - run: cargo test --workspace ${{ matrix.RUST.FLAGS }}
         if: "${{ !matrix.RUST.SKIP_TESTS }}"
@@ -111,19 +99,15 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1
         with:
-          toolchain: 1.76.0
+          toolchain: "1.74"
           components: llvm-tools-preview
 
       - run: sudo apt update && sudo apt-get install -y lcov
 
       - uses: actions/[email protected]
         id: cargo-cache
         with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
+          path: target/
           key: ${{ runner.os }}-cargo-5-${{ hashFiles('**/Cargo.toml') }}
 
       - run: cargo test

Cargo.toml

@@ -10,7 +10,7 @@ categories = ["parser-implementations", "encoding", "no-std"]
 
 edition = "2021"
 # This specifies the MSRV
-rust-version = "1.65.0"
+rust-version = "1.74.0"
 
 [features]
 default = ["std"]

README.md

@@ -13,7 +13,7 @@ Add `asn1` to your `Cargo.toml`:
 $ cargo add asn1
 ```
 
-Builds on Rust 1.65.0 and newer.
+Builds on Rust 1.74.0 and newer.
 
 `rust-asn1` is compatible with `#![no_std]` environments:
 
@@ -23,6 +23,12 @@ $ cargo add asn1 --no-default-features
 
 ## Changelog
 
+### Unreleased
+
+#### Changes
+
+- Updated MSRV to 1.74.0.
+
 ### [0.21.3]
 
 #### Added
@@ -35,7 +41,6 @@ $ cargo add asn1 --no-default-features
 
 - `BigInt::new`, `BigUint::new`, and `DateTime::new` are now `const fn`.
 
-
 ### [0.21.1]
 
 #### Added

asn1_derive/Cargo.toml

@@ -7,7 +7,7 @@ license = "BSD-3-Clause"
 description = "#[derive] support for asn1"
 edition = "2021"
 # This specifies the MSRV
-rust-version = "1.65.0"
+rust-version = "1.74.0"
 
 [lib]
 proc-macro = true

asn1_derive/src/lib.rs

@@ -739,7 +739,7 @@ fn generate_struct_read_block(
                 let name = &f.ident;
                 let is_defined_by_marker = name
                     .as_ref()
-                    .map_or(false, |n| defined_by_markers.contains(n));
+                    .is_some_and(|n| defined_by_markers.contains(n));
                 let name_str = name
                     .as_ref()
                     .ok_or_else(|| syn::Error::new_spanned(f, "Field is missing a name"))?;

asn1parse/Cargo.toml

@@ -3,6 +3,8 @@ name = "asn1parse"
 version = "0.1.0"
 edition = "2021"
 publish = false
+# This specifies the MSRV
+rust-version = "1.74.0"
 
 [dependencies]
 asn1 = { version = "0.21", path = ".." }

src/base128.rs

@@ -1,6 +1,6 @@
 use crate::parser::{ParseError, ParseErrorKind, ParseResult};
 
-const INT_MAX_BYTES: u32 = (u128::BITS + 6) / 7;
+const INT_MAX_BYTES: u32 = u128::BITS.div_ceil(7);
 
 pub(crate) fn read_base128_int(mut data: &[u8]) -> ParseResult<(u128, &[u8])> {
     let mut ret = 0u128;
@@ -30,7 +30,7 @@ pub(crate) fn read_base128_int(mut data: &[u8]) -> ParseResult<(u128, &[u8])> {
 pub(crate) fn base128_length(n: u128) -> usize {
     // Equivalent to: let bits = if n != 0 { 128 - n.leading_zeros() } else { 1 };
     let bits = u128::BITS - (n | 1).leading_zeros();
-    let bytes = (bits + 6) / 7;
+    let bytes = bits.div_ceil(7);
     bytes as usize
 }
 

src/types.rs

@@ -1277,7 +1277,7 @@ impl<T: Asn1Writable> Asn1Writable for Option<T> {
 }
 
 macro_rules! declare_choice {
-    ($count:ident => $(($number:ident $name:ident)),*) => {
+    ($count:ident => $(($number:ident $name:ident)),+) => {
         /// Represents an ASN.1 `CHOICE` with the provided number of potential
         /// types.
         ///
@@ -1287,7 +1287,7 @@ macro_rules! declare_choice {
         /// `#[derive(asn1::Asn1Write)]` APIs.
         #[derive(Debug, PartialEq, Eq)]
         pub enum $count<
-            $($number,)*
+            $($number,)+
         > {
             $(
                 $name($number),
@@ -1299,14 +1299,14 @@ macro_rules! declare_choice {
             $(
                 $number: Asn1Readable<'a>,
             )*
-        > Asn1Readable<'a> for $count<$($number,)*> {
+        > Asn1Readable<'a> for $count<$($number,)+> {
             fn parse(parser: &mut Parser<'a>) -> ParseResult<Self> {
                 let tlv = parser.read_tlv()?;
                 $(
                     if $number::can_parse(tlv.tag()) {
                         return Ok($count::$name(tlv.parse::<$number>()?));
                     }
-                )*
+                )+
                 Err(ParseError::new(ParseErrorKind::UnexpectedTag{actual: tlv.tag()}))
             }
 
@@ -1315,21 +1315,21 @@ macro_rules! declare_choice {
                     if $number::can_parse(tag) {
                         return true;
                     }
-                )*
+                )+
                 false
             }
         }
 
         impl<
             $(
                 $number: Asn1Writable,
-            )*
-        > Asn1Writable for $count<$($number,)*> {
+            )+
+        > Asn1Writable for $count<$($number,)+> {
             fn write(&self, w: &mut Writer<'_>) -> WriteResult {
                 match self {
                     $(
                         $count::$name(v) => w.write_element(v),
-                    )*
+                    )+
                 }
             }
         }