upgrade toolchain to rust 1.88 (#1441)

Schniz · web-flow · commit bc4d19a481c1 · 2025-07-02T08:59:25.000+03:00
* update rust versions

* run cargo clippy --fix

* changeset

* update action

* update zig installation

* use mlugg/setup-zig@v2

* maybe we can drop zigbuild? no time to debug this
diff --git a/.changeset/twelve-badgers-happen.md b/.changeset/twelve-badgers-happen.md
@@ -0,0 +1,5 @@
+---
+"fnm": patch
+---
+
+bump Rust toolchain to 1.88
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -11,13 +11,13 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  RUST_VERSION: "1.81"
+  RUST_VERSION: "1.88"
 
 jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
       - uses: Swatinem/rust-cache@v2
@@ -28,7 +28,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
       - uses: Swatinem/rust-cache@v2
@@ -42,7 +42,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
       - uses: Swatinem/rust-cache@v2
@@ -54,7 +54,7 @@ jobs:
     runs-on: windows-latest
     name: "Release build for Windows"
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
       - uses: Swatinem/rust-cache@v2
@@ -72,19 +72,26 @@ jobs:
     runs-on: macos-latest
     name: "Release build for macOS"
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
           targets: x86_64-apple-darwin,aarch64-apple-darwin
       - uses: Swatinem/rust-cache@v2
-      - uses: mlugg/setup-zig@v1
-      - run: cargo install --locked cargo-zigbuild
       - uses: actions/checkout@v4
       - name: Build release binary
         run: |
-          cargo zigbuild --release --target=universal2-apple-darwin
+          cargo build --release --target x86_64-apple-darwin
+          strip target/x86_64-apple-darwin/release/fnm
+          cargo build --release --target aarch64-apple-darwin
+          strip target/aarch64-apple-darwin/release/fnm
+
           mkdir -p target/release
-          cp target/universal2-apple-darwin/release/fnm target/release/fnm
+
+          # create a universal binary
+          lipo -create \
+            target/x86_64-apple-darwin/release/fnm \
+            target/aarch64-apple-darwin/release/fnm \
+            -output target/release/fnm
         env:
           LZMA_API_STATIC: "true"
       - name: Strip binary from debug symbols
@@ -245,7 +252,7 @@ jobs:
     name: "Build static Linux binary"
     runs-on: ubuntu-latest
     steps:
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
           targets: x86_64-unknown-linux-musl
@@ -286,7 +293,7 @@ jobs:
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v3
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{env.RUST_VERSION}}
       - uses: Swatinem/rust-cache@v2
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.81"
+channel = "1.88"
 components = ["rustfmt", "clippy"]
diff --git a/src/commands/completions.rs b/src/commands/completions.rs
@@ -21,7 +21,7 @@ impl Command for Completions {
         let shell: Box<dyn Shell> = self
             .shell
             .map(Into::into)
-            .or_else(|| infer_shell().map(Into::into))
+            .or_else(|| infer_shell())
             .ok_or(Error::CantInferShell)?;
         let shell: ClapShell = shell.into();
         let mut app = Cli::command();
diff --git a/src/commands/install.rs b/src/commands/install.rs
@@ -149,7 +149,7 @@ impl Command for Install {
             }
             Err(source) => Err(Error::DownloadError { source })?,
             Ok(()) => {}
-        };
+        }
 
         if !config.default_version_dir().exists() {
             debug!("Tagging {} as the default version", version.v_str().cyan());
diff --git a/src/commands/ls_remote.rs b/src/commands/ls_remote.rs
@@ -61,7 +61,7 @@ impl super::command::Command for LsRemote {
                         .is_some_and(|v_lts| v_lts.eq_ignore_ascii_case(codename))
                 }),
                 None => all_versions.retain(|v| v.lts.is_some()),
-            };
+            }
         }
 
         if let Some(filter) = &self.filter {
diff --git a/src/installed_versions.rs b/src/installed_versions.rs
@@ -9,7 +9,7 @@ pub fn list<P: AsRef<Path>>(installations_dir: P) -> Result<Vec<Version>, Error>
         if entry
             .file_name()
             .to_str()
-            .map_or(false, |s| s.starts_with('.'))
+            .is_some_and(|s| s.starts_with('.'))
         {
             continue;
         }
diff --git a/src/lts.rs b/src/lts.rs
@@ -34,14 +34,14 @@ impl LtsType {
         versions: &'vec [IndexedNodeVersion],
     ) -> Option<&'vec IndexedNodeVersion> {
         match self {
-            Self::Latest => versions.iter().filter(|x| x.lts.is_some()).last(),
+            Self::Latest => versions.iter().filter(|x| x.lts.is_some()).next_back(),
             Self::CodeName(s) => versions
                 .iter()
                 .filter(|x| match &x.lts {
                     None => false,
                     Some(x) => s.to_lowercase() == x.to_lowercase(),
                 })
-                .last(),
+                .next_back(),
         }
     }
 }
diff --git a/src/remote_node_index.rs b/src/remote_node_index.rs
@@ -84,8 +84,7 @@ pub enum Error {
 pub fn list(base_url: &Url) -> Result<Vec<IndexedNodeVersion>, Error> {
     let base_url = base_url.as_str().trim_end_matches('/');
     let index_json_url = format!("{base_url}/index.json");
-    let resp = crate::http::get(&index_json_url)
-        .map_err(crate::http::Error::from)?
+    let resp = crate::http::get(&index_json_url)?
         .error_for_status()
         .map_err(crate::http::Error::from)?;
     let text = resp.text().map_err(crate::http::Error::from)?;
diff --git a/src/shell/bash.rs b/src/shell/bash.rs
@@ -33,11 +33,11 @@ impl Shell for Bash {
         };
         let autoload_hook = match config.version_file_strategy() {
             VersionFileStrategy::Local => formatdoc!(
-                r#"
+                r"
                     if [[ {version_file_exists_condition} ]]; then
                         fnm use --silent-if-unchanged
                     fi
-                "#,
+                ",
                 version_file_exists_condition = version_file_exists_condition,
             ),
             VersionFileStrategy::Recursive => String::from(r"fnm use --silent-if-unchanged"),
diff --git a/src/shell/fish.rs b/src/shell/fish.rs
@@ -33,24 +33,24 @@ impl Shell for Fish {
         };
         let autoload_hook = match config.version_file_strategy() {
             VersionFileStrategy::Local => formatdoc!(
-                r#"
+                r"
                     if {version_file_exists_condition}
                         fnm use --silent-if-unchanged
                     end
-                "#,
+                ",
                 version_file_exists_condition = version_file_exists_condition,
             ),
             VersionFileStrategy::Recursive => String::from(r"fnm use --silent-if-unchanged"),
         };
         Ok(formatdoc!(
-            r#"
+            r"
                 function _fnm_autoload_hook --on-variable PWD --description 'Change Node version on directory change'
                     status --is-command-substitution; and return
                     {autoload_hook}
                 end
 
                 _fnm_autoload_hook
-            "#,
+            ",
             autoload_hook = autoload_hook
         ))
     }
diff --git a/src/shell/infer/mod.rs b/src/shell/infer/mod.rs
@@ -16,6 +16,6 @@ fn shell_from_string(shell: &str) -> Option<Box<dyn super::Shell>> {
         "pwsh" | "powershell" => return Some(Box::from(PowerShell)),
         "cmd" => return Some(Box::from(WindowsCmd)),
         cmd_name => log::debug!("binary is not a supported shell: {:?}", cmd_name),
-    };
+    }
     None
 }
diff --git a/src/shell/infer/unix.rs b/src/shell/infer/unix.rs
@@ -32,7 +32,7 @@ pub fn infer_shell() -> Option<Box<dyn Shell>> {
             .command
             .trim_start_matches('-')
             .split('/')
-            .last()?;
+            .next_back()?;
 
         if let Some(shell) = super::shell_from_string(binary) {
             return Some(shell);
diff --git a/src/shell/powershell.rs b/src/shell/powershell.rs
@@ -33,21 +33,21 @@ impl Shell for PowerShell {
         };
         let autoload_hook = match config.version_file_strategy() {
             VersionFileStrategy::Local => formatdoc!(
-                r#"
+                r"
                     If ({version_file_exists_condition}) {{ & fnm use --silent-if-unchanged }}
-                "#,
+                ",
                 version_file_exists_condition = version_file_exists_condition,
             ),
             VersionFileStrategy::Recursive => String::from(r"fnm use --silent-if-unchanged"),
         };
         Ok(formatdoc!(
-            r#"
+            r"
                 function global:Set-FnmOnLoad {{ {autoload_hook} }}
                 function global:Set-LocationWithFnm {{ param($path); if ($path -eq $null) {{Set-Location}} else {{Set-Location $path}}; Set-FnmOnLoad }}
                 Set-Alias -Scope global cd_with_fnm Set-LocationWithFnm
                 Set-Alias -Option AllScope -Scope global cd Set-LocationWithFnm
                 Set-FnmOnLoad
-            "#,
+            ",
             autoload_hook = autoload_hook
         ))
     }
diff --git a/src/shell/zsh.rs b/src/shell/zsh.rs
@@ -37,25 +37,25 @@ impl Shell for Zsh {
         };
         let autoload_hook = match config.version_file_strategy() {
             VersionFileStrategy::Local => formatdoc!(
-                r#"
+                r"
                     if [[ {version_file_exists_condition} ]]; then
                         fnm use --silent-if-unchanged
                     fi
-                "#,
+                ",
                 version_file_exists_condition = version_file_exists_condition,
             ),
             VersionFileStrategy::Recursive => String::from(r"fnm use --silent-if-unchanged"),
         };
         Ok(formatdoc!(
-            r#"
+            r"
                 autoload -U add-zsh-hook
                 _fnm_autoload_hook () {{
                     {autoload_hook}
                 }}
 
                 add-zsh-hook chpwd _fnm_autoload_hook \
                     && _fnm_autoload_hook
-            "#,
+            ",
             autoload_hook = autoload_hook
         ))
     }
diff --git a/src/version.rs b/src/version.rs
@@ -14,7 +14,7 @@ pub enum Version {
 }
 
 fn first_letter_is_number(s: &str) -> bool {
-    s.chars().next().map_or(false, |x| x.is_ascii_digit())
+    s.chars().next().is_some_and(|x| x.is_ascii_digit())
 }
 
 impl Version {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"fnm": patch
 +---
++
 +bump Rust toolchain to 1.88
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ impl Command for Install {`
`149`	`149`	`}`
`150`	`150`	`Err(source) => Err(Error::DownloadError { source })?,`
`151`	`151`	`Ok(()) => {}`
`152`		`- };`
	`152`	`+ }`
`153`	`153`
`154`	`154`	`if !config.default_version_dir().exists() {`
`155`	`155`	`debug!("Tagging {} as the default version", version.v_str().cyan());`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ impl super::command::Command for LsRemote {`
`61`	`61`	`.is_some_and(\|v_lts\| v_lts.eq_ignore_ascii_case(codename))`
`62`	`62`	`}),`
`63`	`63`	`None => all_versions.retain(\|v\| v.lts.is_some()),`
`64`		`- };`
	`64`	`+ }`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if let Some(filter) = &self.filter {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ pub fn list<P: AsRef<Path>>(installations_dir: P) -> Result<Vec<Version>, Error>`
`9`	`9`	`if entry`
`10`	`10`	`.file_name()`
`11`	`11`	`.to_str()`
`12`		`- .map_or(false, \|s\| s.starts_with('.'))`
	`12`	`+ .is_some_and(\|s\| s.starts_with('.'))`
`13`	`13`	`{`
`14`	`14`	`continue;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,14 @@ impl LtsType {`
`34`	`34`	`versions: &'vec [IndexedNodeVersion],`
`35`	`35`	`) -> Option<&'vec IndexedNodeVersion> {`
`36`	`36`	`match self {`
`37`		`- Self::Latest => versions.iter().filter(\|x\| x.lts.is_some()).last(),`
	`37`	`+ Self::Latest => versions.iter().filter(\|x\| x.lts.is_some()).next_back(),`
`38`	`38`	`Self::CodeName(s) => versions`
`39`	`39`	`.iter()`
`40`	`40`	`.filter(\|x\| match &x.lts {`
`41`	`41`	`None => false,`
`42`	`42`	`Some(x) => s.to_lowercase() == x.to_lowercase(),`
`43`	`43`	`})`
`44`		`- .last(),`
	`44`	`+ .next_back(),`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`