Merge pull request #39 from oxidecomputer/wc/bump-rust-toolchain

Bump Rust toolchain to 1.88

Author: wfchandler

axoproject/src/changelog.rs

@@ -82,7 +82,7 @@ fn try_extract_changelog_exact(
     changelogs: &parse_changelog::Changelog,
     version: &Version,
 ) -> Option<ChangelogInfo> {
-    let version_string = format!("{}", version);
+    let version_string = format!("{version}");
 
     changelogs
         .get(&*version_string)
@@ -106,7 +106,7 @@ fn try_extract_changelog_normalized(
     }
 
     let stable_version = version.stable_part();
-    let stable_version_string = format!("{}", stable_version);
+    let stable_version_string = format!("{stable_version}");
 
     let release_notes = changelogs.get(&*stable_version_string)?;
 
@@ -116,7 +116,7 @@ fn try_extract_changelog_normalized(
     let (prefix, freeform) = raw_title.split_once(&stable_version_string)?;
 
     // insert prerelease suffix into the title
-    let title = format!("{}{}{}", prefix, version, freeform);
+    let title = format!("{prefix}{version}{freeform}");
 
     Some(ChangelogInfo {
         title,

axoproject/src/tests.rs

@@ -151,7 +151,7 @@ fn test_cargo_nonvirtual() {
 
     {
         let package = get_package(&packages, "some-cdylib");
-        assert_eq!(package.name, "some-cdylib", "packages: {:?}", packages);
+        assert_eq!(package.name, "some-cdylib", "packages: {packages:?}");
         assert!(package.binaries.is_empty());
     }
 

cargo-dist/src/announce.rs

@@ -257,7 +257,7 @@ impl Display for DisabledReason {
             Self::DistFalse => write!(f, "dist = false"),
             Self::PublishFalse => write!(f, "publish = false"),
             Self::NoArtifacts { kinds } => write!(f, "no {}", kinds.join(" ")),
-            Self::TagNotMatched { tag } => write!(f, "didn't match tag {}", tag),
+            Self::TagNotMatched { tag } => write!(f, "didn't match tag {tag}"),
         }
     }
 }
@@ -504,7 +504,7 @@ fn select_packages(
         // Report each binary and potentially add it to the Release for this package
         let mut binaries = vec![];
         for binary in &pkg.binaries {
-            info!("    {}", sty.apply_to(format!("[bin] {}", binary)));
+            info!("    {}", sty.apply_to(format!("[bin] {binary}")));
             // In the future might want to allow this to be granular for each binary
             if disabled_reason.is_none() {
                 binaries.push(binary.to_owned());
@@ -513,15 +513,15 @@ fn select_packages(
 
         let mut cdylibs = vec![];
         for library in &pkg.cdylibs {
-            info!("    {}", sty.apply_to(format!("[cdylib] {}", library)));
+            info!("    {}", sty.apply_to(format!("[cdylib] {library}")));
             // In the future might want to allow this to be granular for each library
             if disabled_reason.is_none() {
                 cdylibs.push(library.to_owned());
             }
         }
         let mut cstaticlibs = vec![];
         for library in &pkg.cstaticlibs {
-            info!("    {}", sty.apply_to(format!("[cstaticlib] {}", library)));
+            info!("    {}", sty.apply_to(format!("[cstaticlib] {library}")));
             // In the future might want to allow this to be granular for each library
             if disabled_reason.is_none() {
                 cstaticlibs.push(library.to_owned());
@@ -910,8 +910,8 @@ pub fn announcement_github(manifest: &mut DistManifest) {
         if !global_installers.is_empty() {
             writeln!(gh_body, "## Install {heading_suffix}\n").unwrap();
             for (desc, hint) in global_installers {
-                writeln!(&mut gh_body, "### {}\n", desc).unwrap();
-                writeln!(&mut gh_body, "```sh\n{}\n```\n", hint).unwrap();
+                writeln!(&mut gh_body, "### {desc}\n").unwrap();
+                writeln!(&mut gh_body, "```sh\n{hint}\n```\n").unwrap();
             }
         }
 

cargo-dist/src/backend/ci/github.rs

@@ -427,7 +427,7 @@ impl GithubCiInfo {
         let rendered = self.generate_github_ci(dist)?;
 
         LocalAsset::write_new_all(&rendered, &ci_file)?;
-        eprintln!("generated Github CI to {}", ci_file);
+        eprintln!("generated Github CI to {ci_file}");
 
         Ok(())
     }

cargo-dist/src/backend/installer/homebrew.rs

@@ -210,7 +210,7 @@ pub fn to_homebrew_license_format(app_license: &str) -> Result<String, ParseErro
                 // Operations are postfix, so we pop off the previous two elements and combine.
                 let second_operand = buffer.pop().expect("Operator missing first operand.");
                 let first_operand = buffer.pop().expect("Operator missing second operand.");
-                let mut combined = format!("{}, {}", first_operand, second_operand);
+                let mut combined = format!("{first_operand}, {second_operand}");
 
                 // If the operations that immediately follow are the same as the current operation,
                 // squash their operands into the same all_of/any_of clause.
@@ -220,7 +220,7 @@ pub fn to_homebrew_license_format(app_license: &str) -> Result<String, ParseErro
                     }
                     let _ = spdx.next();
                     let operand = buffer.pop().expect("Operator missing first operand.");
-                    combined = format!("{}, {}", operand, combined);
+                    combined = format!("{operand}, {combined}");
                 }
 
                 // Use corresponding homebrew DSL keyword and square bracket the list of licenses.

cargo-dist/src/backend/installer/msi.rs

@@ -111,7 +111,7 @@ impl MsiInstallerInfo {
         write_render(license)?;
         write_render(eula)?;
 
-        eprintln!("generated msi definition to {}", file);
+        eprintln!("generated msi definition to {file}");
 
         Ok(())
     }

cargo-dist/src/build/cargo.rs

@@ -245,7 +245,7 @@ pub fn make_build_cargo_target_command(
         }
         CargoTargetPackages::Package(package) => {
             command.arg("--package").arg(package);
-            eprintln!(" --package={})", package);
+            eprintln!(" --package={package})");
         }
     }
 

cargo-dist/src/build/generic.rs

@@ -223,7 +223,7 @@ pub fn build_generic_target(
     )?;
 
     if !result.success() {
-        eprintln!("Build exited non-zero: {}", result);
+        eprintln!("Build exited non-zero: {result}");
     }
 
     let mut expected = BuildExpectations::new(dist_graph, &target.expected_binaries);
@@ -253,7 +253,7 @@ pub fn run_extra_artifacts_build(dist: &DistGraph, build: &ExtraBuildStep) -> Di
     let result = run_build(dist, &build.build_command, &build.working_dir, None)?;
 
     if !result.success() {
-        eprintln!("Build exited non-zero: {}", result);
+        eprintln!("Build exited non-zero: {result}");
     }
 
     // Check that we got everything we expected, and copy into the distribution path

cargo-dist/src/config/mod.rs

@@ -504,7 +504,7 @@ impl std::str::FromStr for InstallPathStrategy {
 impl std::fmt::Display for InstallPathStrategy {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            InstallPathStrategy::CargoHome => write!(f, "{}", CARGO_HOME_INSTALL_PATH),
+            InstallPathStrategy::CargoHome => write!(f, "{CARGO_HOME_INSTALL_PATH}"),
             InstallPathStrategy::HomeSubdir { subdir } => write!(f, "~/{subdir}"),
             InstallPathStrategy::EnvSubdir { env_key, subdir } => write!(f, "${env_key}/{subdir}"),
         }