Revert MSRV to 1.48 (#87)

Co-authored-by: Sebastian Dröge <sebastian@centricular.com>
ia0 · Nov 12, 2023 · d137ca1 · d137ca1
1 parent fa533bd
commit d137ca1
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -211,37 +211,49 @@ 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: cd lib && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib && cp Cargo.lock.msrv 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
+      - run: cd lib && rm Cargo.lock
+      - run: cd lib && mv Cargo.lock.backup Cargo.lock
+      - run: cd lib/macro/internal && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib/macro/internal && cp Cargo.lock.msrv Cargo.lock
+      - 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
+      - run: cd lib/macro/internal && rm Cargo.lock
+      - run: cd lib/macro/internal && mv Cargo.lock.backup Cargo.lock
+      - run: cd lib/macro && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib/macro && cp Cargo.lock.msrv Cargo.lock
+      - 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
+      - run: cd lib/macro && rm Cargo.lock
+      - run: cd lib/macro && mv Cargo.lock.backup Cargo.lock
   windows:
     runs-on: windows-latest
     steps:
@@ -320,34 +332,46 @@ 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: cd lib && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib && cp Cargo.lock.msrv 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
+      - run: cd lib && rm Cargo.lock
+      - run: cd lib && mv Cargo.lock.backup Cargo.lock
+      - run: cd lib/macro/internal && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib/macro/internal && cp Cargo.lock.msrv Cargo.lock
+      - 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
+      - run: cd lib/macro/internal && rm Cargo.lock
+      - run: cd lib/macro/internal && mv Cargo.lock.backup Cargo.lock
+      - run: cd lib/macro && mv Cargo.lock Cargo.lock.backup
+      - run: cd lib/macro && cp Cargo.lock.msrv Cargo.lock
+      - 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
+      - run: cd lib/macro && rm Cargo.lock
+      - run: cd lib/macro && mv Cargo.lock.backup Cargo.lock
diff --git a/lib/CHANGELOG.md b/lib/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Minor
 
 - Make some functions `must_use`
-- Bump MSRV from 1.47 to 1.70
+- Bump MSRV from 1.47 to 1.48
 
 ### Patch
 

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
@@ -147,15 +147,17 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 // TODO: This list up to warn(clippy::pedantic) should ideally use a lint group.
 #![warn(elided_lifetimes_in_paths)]
-#![warn(let_underscore_drop)]
+// TODO(msrv): #![warn(let_underscore_drop)]
 #![warn(missing_debug_implementations)]
 #![warn(missing_docs)]
 #![warn(unreachable_pub)]
-#![warn(unsafe_op_in_unsafe_fn)]
+// TODO(msrv): #![warn(unsafe_op_in_unsafe_fn)]
 #![warn(unused_results)]
+#![allow(unused_unsafe)] // TODO(msrv)
 #![warn(clippy::pedantic)]
 #![allow(clippy::enum_glob_use)]
 #![allow(clippy::similar_names)]
+#![allow(clippy::uninlined_format_args)] // TODO(msrv)
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
@@ -304,7 +306,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 +1567,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,
 }
 
@@ -164,6 +164,18 @@ impl Action {
                 args: vec![format!("+{}", self.toolchain)],
             };
         }
+        if self.toolchain == Toolchain::Msrv {
+            let lock = "Cargo.lock";
+            let backup = "Cargo.lock.backup";
+            let msrv = "Cargo.lock.msrv";
+            // We assume a lock file already exists, which should often by the case.
+            instructions += Instruction::shell("mv", &[lock, backup]);
+            instructions += Instruction::shell("cp", &[msrv, lock]);
+            instructions.0.rotate_right(2);
+            // We have to remove first because Windows cannot move on an existing file.
+            instructions += Instruction::shell("rm", &[lock]);
+            instructions += Instruction::shell("mv", &[backup, lock]);
+        }
         instructions
     }
 }
@@ -183,6 +195,15 @@ struct Instruction {
 }
 
 impl Instruction {
+    fn shell(cmd: &str, args: &[&str]) -> Self {
+        Instruction {
+            executor: Executor::Shell,
+            env: vec![],
+            cmd: cmd.to_string(),
+            args: args.iter().map(|x| x.to_string()).collect(),
+        }
+    }
+
     fn execute(&self, toolchain: Toolchain, dir: Dir) {
         let mut command = match self.executor {
             Executor::Cargo => {