Bump msrv to 1.85

.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

.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

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 }

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<u8> {
     let mut cmd = process::Command::new("rustc");
-    cmd.args(["+1.63", "--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<u8> {
 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",

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))
                     })
                 });