Downgrade MSRV to 1.48

This is the version currently available in Debian oldstable and should be a reasonable choice. Also check in the CI that everything still compiles with that version and fixed Cargo.lock files that use older dependency versions than what cargo would select by itself. fixup
ia0 · Nov 8, 2023 · 4597e11 · 4597e11
1 parent fa533bd
commit 4597e11
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -211,36 +211,39 @@ jobs:
       - name: cd lib/macro && cargo +stable semver-checks check-release
         run: cargo +stable semver-checks check-release
         working-directory: lib/macro
-      - run: rustup install 1.70
-      - name: cd lib && cargo +1.70 build
-        run: cargo +1.70 build
+      - run: rustup install 1.48
+      - run: mv lib/Cargo.lock.msrv lib/Cargo.lock
+      - run: mv lib/macro/internal/Cargo.lock.msrv lib/macro/internal/Cargo.lock
+      - run: mv lib/macro/Cargo.lock.msrv lib/macro/Cargo.lock
+      - name: cd lib && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --no-default-features --features=alloc
-        run: cargo +1.70 build --no-default-features --features=alloc
+      - name: cd lib && cargo +1.48 build --no-default-features --features=alloc
+        run: cargo +1.48 build --no-default-features --features=alloc
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release --no-default-features --features=alloc
-        run: cargo +1.70 build --release --no-default-features --features=alloc
+      - name: cd lib && cargo +1.48 build --release --no-default-features --features=alloc
+        run: cargo +1.48 build --release --no-default-features --features=alloc
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --no-default-features
-        run: cargo +1.70 build --no-default-features
+      - name: cd lib && cargo +1.48 build --no-default-features
+        run: cargo +1.48 build --no-default-features
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release --no-default-features
-        run: cargo +1.70 build --release --no-default-features
+      - name: cd lib && cargo +1.48 build --release --no-default-features
+        run: cargo +1.48 build --release --no-default-features
         working-directory: lib
-      - name: cd lib/macro/internal && cargo +1.70 build
-        run: cargo +1.70 build
+      - name: cd lib/macro/internal && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib/macro/internal
-      - name: cd lib/macro/internal && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib/macro/internal && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib/macro/internal
-      - name: cd lib/macro && cargo +1.70 build
-        run: cargo +1.70 build
+      - name: cd lib/macro && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib/macro
-      - name: cd lib/macro && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib/macro && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib/macro
   windows:
     runs-on: windows-latest
@@ -320,34 +323,37 @@ jobs:
       - name: cd bin && cargo +stable build --release
         run: cargo +stable build --release
         working-directory: bin
-      - run: rustup install 1.70
-      - name: cd lib && cargo +1.70 build
-        run: cargo +1.70 build
+      - run: rustup install 1.48
+      - run: mv lib/Cargo.lock.msrv lib/Cargo.lock
+      - run: mv lib/macro/internal/Cargo.lock.msrv lib/macro/internal/Cargo.lock
+      - run: mv lib/macro/Cargo.lock.msrv lib/macro/Cargo.lock
+      - name: cd lib && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --no-default-features --features=alloc
-        run: cargo +1.70 build --no-default-features --features=alloc
+      - name: cd lib && cargo +1.48 build --no-default-features --features=alloc
+        run: cargo +1.48 build --no-default-features --features=alloc
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release --no-default-features --features=alloc
-        run: cargo +1.70 build --release --no-default-features --features=alloc
+      - name: cd lib && cargo +1.48 build --release --no-default-features --features=alloc
+        run: cargo +1.48 build --release --no-default-features --features=alloc
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --no-default-features
-        run: cargo +1.70 build --no-default-features
+      - name: cd lib && cargo +1.48 build --no-default-features
+        run: cargo +1.48 build --no-default-features
         working-directory: lib
-      - name: cd lib && cargo +1.70 build --release --no-default-features
-        run: cargo +1.70 build --release --no-default-features
+      - name: cd lib && cargo +1.48 build --release --no-default-features
+        run: cargo +1.48 build --release --no-default-features
         working-directory: lib
-      - name: cd lib/macro/internal && cargo +1.70 build
-        run: cargo +1.70 build
+      - name: cd lib/macro/internal && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib/macro/internal
-      - name: cd lib/macro/internal && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib/macro/internal && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib/macro/internal
-      - name: cd lib/macro && cargo +1.70 build
-        run: cargo +1.70 build
+      - name: cd lib/macro && cargo +1.48 build
+        run: cargo +1.48 build
         working-directory: lib/macro
-      - name: cd lib/macro && cargo +1.70 build --release
-        run: cargo +1.70 build --release
+      - name: cd lib/macro && cargo +1.48 build --release
+        run: cargo +1.48 build --release
         working-directory: lib/macro
diff --git a/lib/Cargo.lock.msrv b/lib/Cargo.lock.msrv
diff --git a/lib/macro/Cargo.lock.msrv b/lib/macro/Cargo.lock.msrv
diff --git a/lib/macro/internal/Cargo.lock.msrv b/lib/macro/internal/Cargo.lock.msrv
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -151,7 +151,6 @@
 #![warn(missing_debug_implementations)]
 #![warn(missing_docs)]
 #![warn(unreachable_pub)]
-#![warn(unsafe_op_in_unsafe_fn)]
 #![warn(unused_results)]
 #![warn(clippy::pedantic)]
 #![allow(clippy::enum_glob_use)]
@@ -304,7 +303,7 @@ impl core::fmt::Display for DecodeKind {
             DecodeKind::Trailing => "non-zero trailing bits",
             DecodeKind::Padding => "invalid padding length",
         };
-        write!(f, "{description}")
+        write!(f, "{}", description)
     }
 }
 
@@ -1565,7 +1564,7 @@ impl core::fmt::Display for SpecificationError {
             Duplicate(c) => write!(f, "{:?} has conflicting definitions", c as char),
             ExtraPadding => write!(f, "unnecessary padding"),
             WrapLength => write!(f, "invalid wrap width or separator length"),
-            WrapWidth(x) => write!(f, "wrap width not a multiple of {x}"),
+            WrapWidth(x) => write!(f, "wrap width not a multiple of {}", x),
             FromTo => write!(f, "translate from/to length mismatch"),
             Undefined(c) => write!(f, "{:?} is undefined", c as char),
         }

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -32,7 +32,7 @@ enum Toolchain {
     #[strum(serialize = "stable")]
     Stable,
 
-    #[strum(serialize = "1.70")]
+    #[strum(serialize = "1.48")]
     Msrv,
 }
 
@@ -371,6 +371,19 @@ impl Flags {
                             run: Some(format!("rustup install {}", actions[0].toolchain)),
                             ..Default::default()
                         });
+
+                        if actions[0].toolchain == Toolchain::Msrv {
+                            for dir in Dir::iter().filter(|x| x.is_published() && x != &Dir::Bin) {
+                                job.steps.push(WorkflowStep {
+                                    run: Some(format!(
+                                        "mv {}/Cargo.lock.msrv {}/Cargo.lock",
+                                        dir, dir
+                                    )),
+                                    ..Default::default()
+                                });
+                            }
+                        }
+
                         let components: BTreeSet<_> = actions
                             .iter()
                             .filter_map(|x| match x.task {