From 91fd966b48e2ca7980350a20694ff81414548b0b Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 10 Aug 2025 17:57:31 +1000 Subject: [PATCH 1/6] Bump rust-version to 1.85 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 610415af..6c8c332a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ categories = ["development-tools::build-utils"] # The binary target is only used by tests. exclude = ["/.github", "tests", "src/bin"] edition = "2018" -rust-version = "1.63" +rust-version = "1.85" [dependencies] jobserver = { version = "0.1.30", default-features = false, optional = true } From b4a3d6c489fa9090de9d2fc622590c57323b16ea Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 10 Aug 2025 17:59:33 +1000 Subject: [PATCH 2/6] ci: use msrv 1.85.0 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 075c5e4a..99d7082d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -349,7 +349,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] env: - MSRV: 1.63.0 + MSRV: 1.85.0 steps: - uses: actions/checkout@v4 - name: Install Rust @@ -361,8 +361,8 @@ jobs: - name: Create Cargo.lock with minimal version run: cargo +nightly update -Zminimal-versions - uses: Swatinem/rust-cache@v2 - - run: env -u CARGO_REGISTRIES_CRATES_IO_PROTOCOL cargo check --lib -p cc --locked - - run: env -u CARGO_REGISTRIES_CRATES_IO_PROTOCOL cargo check --lib -p cc --locked --all-features + - run: cargo check --lib -p cc --locked + - run: cargo check --lib -p cc --locked --all-features clippy: name: Clippy From 113d2f20a79928c18959aa12b2c4a29249fc16ed Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 10 Aug 2025 18:02:47 +1000 Subject: [PATCH 3/6] Fix clippy in lib.rs --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 2da9a3c9..124c09b4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1490,7 +1490,7 @@ impl Build { .and_then(|(_, lib_paths)| { env::split_paths(lib_paths).find(|path| { let sub = Path::new("atlmfc/lib"); - path.ends_with(sub) || path.parent().map_or(false, |p| p.ends_with(sub)) + path.ends_with(sub) || path.parent().is_some_and(|p| p.ends_with(sub)) }) }); From dd5546f33d7b23f9a718675562858a81bb93581e Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 10 Aug 2025 18:18:38 +1000 Subject: [PATCH 4/6] Use msrv 1.85 in gen-target-info --- dev-tools/gen-target-info/src/read.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/gen-target-info/src/read.rs b/dev-tools/gen-target-info/src/read.rs index 4e61b2e9..d8bf49c3 100644 --- a/dev-tools/gen-target-info/src/read.rs +++ b/dev-tools/gen-target-info/src/read.rs @@ -4,7 +4,7 @@ use crate::{RustcTargetSpecs, TargetSpec}; pub fn get_targets_msrv() -> Vec { let mut cmd = process::Command::new("rustc"); - cmd.args(["+1.63", "--print", "target-list"]); + cmd.args(["+1.85", "--print", "target-list"]); cmd.stdout(process::Stdio::piped()); cmd.stderr(process::Stdio::inherit()); From dbd44d0c2e6625c6efd4fc028239176d039afc60 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sun, 10 Aug 2025 18:19:20 +1000 Subject: [PATCH 5/6] ci: Install rust 1.85 in regenerate-target-info.yml --- .github/workflows/regenerate-target-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regenerate-target-info.yml b/.github/workflows/regenerate-target-info.yml index 80a51fd7..0e7097e1 100644 --- a/.github/workflows/regenerate-target-info.yml +++ b/.github/workflows/regenerate-target-info.yml @@ -27,7 +27,7 @@ jobs: - name: Install rust # Install both MSRV and current nightly run: | - rustup toolchain install 1.63 stable nightly --no-self-update --profile minimal + rustup toolchain install 1.85 stable nightly --no-self-update --profile minimal - name: Create lockfile run: cargo update From bfd82143e615f5c9053ebbe18e012213eeb79e15 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 11 Aug 2025 18:29:07 +1000 Subject: [PATCH 6/6] Fix use of old msrv in gen-target-info --- dev-tools/gen-target-info/src/read.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-tools/gen-target-info/src/read.rs b/dev-tools/gen-target-info/src/read.rs index d8bf49c3..d0b6b23e 100644 --- a/dev-tools/gen-target-info/src/read.rs +++ b/dev-tools/gen-target-info/src/read.rs @@ -2,9 +2,11 @@ use std::process; use crate::{RustcTargetSpecs, TargetSpec}; +const RUSTC_VERSION: &str = "+1.85"; + pub fn get_targets_msrv() -> Vec { let mut cmd = process::Command::new("rustc"); - cmd.args(["+1.85", "--print", "target-list"]); + cmd.args([RUSTC_VERSION, "--print", "target-list"]); cmd.stdout(process::Stdio::piped()); cmd.stderr(process::Stdio::inherit()); @@ -20,7 +22,7 @@ pub fn get_targets_msrv() -> Vec { pub fn get_target_spec_from_msrv(target: &str) -> TargetSpec { let mut cmd = process::Command::new("rustc"); cmd.args([ - "+1.63", + RUSTC_VERSION, "-Zunstable-options", "--print", "target-spec-json",