From d7650b2af89274b94172e671e92bb72acfac3a37 Mon Sep 17 00:00:00 2001 From: BD103 <59022059+BD103@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:43:05 -0400 Subject: [PATCH] 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. --- .github/workflows/ci.yml | 34 ++++++++++++++++------------------ tests/crate/Cargo.toml | 26 -------------------------- tests/crate/test.rs | 1 - 3 files changed, 16 insertions(+), 45 deletions(-) delete mode 100644 tests/crate/Cargo.toml delete mode 100644 tests/crate/test.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 896f4f61a..4bd0f723c 100644 --- 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 deleted file mode 100644 index 54a305fdb..000000000 --- a/tests/crate/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[workspace] -[package] -name = "syn-test-suite" -version = "0.0.0" -authors = ["David Tolnay "] -edition = "2021" -publish = false - -[lib] -path = "test.rs" - -[dependencies] -syn = { path = "../..", default-features = false } - -[features] -default = ["derive", "parsing", "printing", "clone-impls", "proc-macro"] -derive = ["syn/derive"] -full = ["syn/full"] -parsing = ["syn/parsing"] -printing = ["syn/printing"] -visit = ["syn/visit"] -visit-mut = ["syn/visit-mut"] -fold = ["syn/fold"] -clone-impls = ["syn/clone-impls"] -extra-traits = ["syn/extra-traits"] -proc-macro = ["syn/proc-macro"] diff --git a/tests/crate/test.rs b/tests/crate/test.rs deleted file mode 100644 index 6c7766063..000000000 --- a/tests/crate/test.rs +++ /dev/null @@ -1 +0,0 @@ -pub use syn::*;