chore: bump msrv to 1.60 (pt. 2)

This change is using 6e8a372 for reference. I'm not entirely sure what the purpost of `manifestpath` was, so I may have done something incorrect.
dtolnay · Mar 30, 2024 · d7650b2 · d7650b2
1 parent 4913ab2
commit d7650b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,8 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: Remove 1.56 CI
-        rust: [stable, beta, 1.60.0, 1.56.0]
+        rust: [stable, beta, 1.60.0]
         include:
           - rust: nightly
             components: rustc-dev
@@ -53,7 +52,6 @@ jobs:
             os: windows
     env:
       target: ${{matrix.target && format('--target={0}', matrix.target)}}
-      manifestpath: ${{matrix.rust == '1.56.0' && '--manifest-path tests/crate/Cargo.toml' || ''}}
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
@@ -62,21 +60,21 @@ jobs:
           toolchain: ${{matrix.rust}}
           targets: ${{matrix.target}}
           components: ${{matrix.components}}
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features
-      - run: cargo check ${{env.manifestpath}} ${{env.target}}
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --features full
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --features 'fold visit visit-mut'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --features 'full fold visit visit-mut'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features derive
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'derive parsing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'derive printing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'proc-macro parsing printing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features full
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'full parsing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'full printing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'full parsing printing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'fold visit visit-mut parsing printing'
-      - run: cargo check ${{env.manifestpath}} ${{env.target}} --no-default-features --features 'full fold visit visit-mut parsing printing'
+      - run: cargo check ${{env.target}} --no-default-features
+      - run: cargo check ${{env.target}}
+      - run: cargo check ${{env.target}} --features full
+      - run: cargo check ${{env.target}} --features 'fold visit visit-mut'
+      - run: cargo check ${{env.target}} --features 'full fold visit visit-mut'
+      - run: cargo check ${{env.target}} --no-default-features --features derive
+      - run: cargo check ${{env.target}} --no-default-features --features 'derive parsing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'derive printing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'proc-macro parsing printing'
+      - run: cargo check ${{env.target}} --no-default-features --features full
+      - run: cargo check ${{env.target}} --no-default-features --features 'full parsing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'full printing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'full parsing printing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'fold visit visit-mut parsing printing'
+      - run: cargo check ${{env.target}} --no-default-features --features 'full fold visit visit-mut parsing printing'
       - if: matrix.components == 'rustc-dev'
         run: cargo check --benches --all-features --release
 

diff --git a/tests/crate/Cargo.toml b/tests/crate/Cargo.toml
diff --git a/tests/crate/test.rs b/tests/crate/test.rs