Update to Rust 2024 edition (#456)

edmorley · web-flow · commit 97b50ef124b7 · 2025-09-18T11:59:14.000+02:00
Updates the project to Rust 2024 edition: - https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html - https://doc.rust-lang.org/edition-guide/rust-2024/index.html Most changes were applied via `cargo clippy --all-targets --fix` and `cargo fmt`. GUS-W-19631971.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,8 @@ cache_diff = { version = "1.1", features = ["bullet_stream"] }
 magic_migrate = { version = "2" }
 
 [workspace.package]
-edition = "2021"
-rust-version = "1.85"
+edition = "2024"
+rust-version = "1.89"
 
 [workspace.lints.rust]
 unreachable_pub = "warn"
diff --git a/buildpacks/ruby/src/layers/bundle_download_layer.rs b/buildpacks/ruby/src/layers/bundle_download_layer.rs
@@ -11,10 +11,10 @@ use cache_diff::CacheDiff;
 use commons::gemfile_lock::ResolvedBundlerVersion;
 use commons::layer::diff_migrate::DiffMigrateLayer;
 use fun_run::{self, CommandWithName};
+use libcnb::Env;
 use libcnb::data::layer_name;
 use libcnb::layer::{EmptyLayerCause, LayerState};
 use libcnb::layer_env::{LayerEnv, ModificationBehavior, Scope};
-use libcnb::Env;
 use magic_migrate::TryMigrate;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
diff --git a/buildpacks/ruby/src/layers/bundle_install_layer.rs b/buildpacks/ruby/src/layers/bundle_install_layer.rs
@@ -19,8 +19,8 @@ use indoc::formatdoc;
 use libcnb::data::layer_name;
 use libcnb::layer::{EmptyLayerCause, LayerState};
 use libcnb::{
-    layer_env::{LayerEnv, ModificationBehavior, Scope},
     Env,
+    layer_env::{LayerEnv, ModificationBehavior, Scope},
 };
 use magic_migrate::TryMigrate;
 use serde::{Deserialize, Serialize};
@@ -153,7 +153,7 @@ impl From<MetadataV3> for MetadataV4 {
 }
 
 fn layer_env(layer_path: &Path, app_dir: &Path, without_default: &BundleWithout) -> LayerEnv {
-    let layer_env = LayerEnv::new()
+    LayerEnv::new()
         .chainable_insert(
             Scope::All,
             ModificationBehavior::Override,
@@ -184,8 +184,7 @@ fn layer_env(layer_path: &Path, app_dir: &Path, without_default: &BundleWithout)
             ModificationBehavior::Override,
             "BUNDLE_FROZEN", // Requires the `Gemfile.lock` to be in sync with the current `Gemfile`.
             "1",
-        );
-    layer_env
+        )
 }
 
 /// Displays the `bundle install` command with `BUNDLE_` environment variables
diff --git a/buildpacks/ruby/src/layers/ruby_install_layer.rs b/buildpacks/ruby/src/layers/ruby_install_layer.rs
@@ -13,8 +13,8 @@
 //!
 use crate::target_id::OsDistribution;
 use crate::{
-    target_id::{TargetId, TargetIdError},
     RubyBuildpack, RubyBuildpackError,
+    target_id::{TargetId, TargetIdError},
 };
 use bullet_stream::global::print;
 use cache_diff::CacheDiff;
@@ -24,7 +24,7 @@ use flate2::read::GzDecoder;
 use libcnb::data::layer_name;
 use libcnb::layer::{EmptyLayerCause, LayerState};
 use libcnb::layer_env::LayerEnv;
-use libherokubuildpack::download::{download_file, DownloadError};
+use libherokubuildpack::download::{DownloadError, download_file};
 use magic_migrate::TryMigrate;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
diff --git a/buildpacks/ruby/src/main.rs b/buildpacks/ruby/src/main.rs
@@ -10,6 +10,7 @@ use core::str::FromStr;
 use fs_err::PathExt;
 use fun_run::CmdError;
 use layers::ruby_install_layer::RubyInstallError;
+use libcnb::Platform;
 use libcnb::build::{BuildContext, BuildResult, BuildResultBuilder};
 use libcnb::data::build_plan::{BuildPlanBuilder, Require};
 use libcnb::data::launch::LaunchBuilder;
@@ -18,8 +19,7 @@ use libcnb::detect::{DetectContext, DetectResult, DetectResultBuilder};
 use libcnb::generic::{GenericMetadata, GenericPlatform};
 use libcnb::layer::UncachedLayerDefinition;
 use libcnb::layer_env::{LayerEnv, ModificationBehavior, Scope};
-use libcnb::Platform;
-use libcnb::{buildpack_main, Buildpack};
+use libcnb::{Buildpack, buildpack_main};
 
 mod gem_list;
 mod layers;
diff --git a/buildpacks/ruby/src/rake_status.rs b/buildpacks/ruby/src/rake_status.rs
@@ -100,10 +100,10 @@ fn asset_manifest_from_glob(
 mod tests {
     use super::*;
     fn touch_file(path: &PathBuf, f: impl FnOnce(&PathBuf)) {
-        if let Some(parent) = path.parent() {
-            if !parent.exists() {
-                fs_err::create_dir_all(parent).unwrap();
-            }
+        if let Some(parent) = path.parent()
+            && !parent.exists()
+        {
+            fs_err::create_dir_all(parent).unwrap();
         }
         fs_err::write(path, "").unwrap();
         f(path);
diff --git a/buildpacks/ruby/src/steps/default_env.rs b/buildpacks/ruby/src/steps/default_env.rs
@@ -2,10 +2,10 @@ use crate::{RubyBuildpack, RubyBuildpackError};
 use libcnb::layer::UncachedLayerDefinition;
 use libcnb::layer_env::{LayerEnv, ModificationBehavior};
 use libcnb::{
+    Env,
     build::BuildContext,
     data::{layer_name, store::Store},
     layer_env::Scope,
-    Env,
 };
 use rand::Rng;
 
diff --git a/buildpacks/ruby/src/steps/detect_rake_tasks.rs b/buildpacks/ruby/src/steps/detect_rake_tasks.rs
@@ -1,11 +1,11 @@
-use crate::gem_list::GemList;
-use crate::rake_status::{check_rake_ready, RakeStatus};
-use crate::rake_task_detect::{self, RakeDetect};
 use crate::RubyBuildpack;
 use crate::RubyBuildpackError;
+use crate::gem_list::GemList;
+use crate::rake_status::{RakeStatus, check_rake_ready};
+use crate::rake_task_detect::{self, RakeDetect};
 use bullet_stream::{global::print, style};
-use libcnb::build::BuildContext;
 use libcnb::Env;
+use libcnb::build::BuildContext;
 
 pub(crate) fn detect_rake_tasks(
     gem_list: &GemList,
diff --git a/buildpacks/ruby/src/steps/get_default_process.rs b/buildpacks/ruby/src/steps/get_default_process.rs
@@ -1,5 +1,5 @@
-use crate::gem_list::GemList;
 use crate::RubyBuildpack;
+use crate::gem_list::GemList;
 use bullet_stream::global::print;
 use bullet_stream::style;
 use libcnb::build::BuildContext;
diff --git a/buildpacks/ruby/src/steps/rake_assets_install.rs b/buildpacks/ruby/src/steps/rake_assets_install.rs
@@ -1,10 +1,10 @@
-use crate::rake_task_detect::RakeDetect;
 use crate::RubyBuildpack;
 use crate::RubyBuildpackError;
+use crate::rake_task_detect::RakeDetect;
 use bullet_stream::{global::print, style};
-use commons::cache::{mib, AppCache, CacheConfig, CacheError, CacheState, KeepPath, PathState};
-use libcnb::build::BuildContext;
+use commons::cache::{AppCache, CacheConfig, CacheError, CacheState, KeepPath, PathState, mib};
 use libcnb::Env;
+use libcnb::build::BuildContext;
 use std::process::Command;
 
 pub(crate) fn rake_assets_install(
@@ -23,13 +23,17 @@ pub(crate) fn rake_assets_install(
             print::sub_bullet(format!(
                 "Skipping {rake_assets_clean} (task not found via {rake_detect_cmd})",
             ));
-            print::sub_bullet(format!("{help} Enable cleaning assets by ensuring {rake_assets_clean} is present when running the detect command locally"));
+            print::sub_bullet(format!(
+                "{help} Enable cleaning assets by ensuring {rake_assets_clean} is present when running the detect command locally"
+            ));
         }
         AssetCases::PrecompileOnly => {
             print::sub_bullet(format!(
                 "Compiling assets without cache (Clean task not found via {rake_detect_cmd})"
             ));
-            print::sub_bullet(format!("{help} Enable caching by ensuring {rake_assets_clean} is present when running the detect command locally"));
+            print::sub_bullet(format!(
+                "{help} Enable caching by ensuring {rake_assets_clean} is present when running the detect command locally"
+            ));
 
             let mut cmd = Command::new("rake");
             cmd.args(["assets:precompile", "--trace"])
@@ -43,7 +47,9 @@ pub(crate) fn rake_assets_install(
                 .map_err(RubyBuildpackError::RakeAssetsPrecompileFailed)?;
         }
         AssetCases::PrecompileAndClean => {
-            print::sub_bullet(format!("Compiling assets with cache (detected {rake_assets_precompile} and {rake_assets_clean} via {rake_detect_cmd})"));
+            print::sub_bullet(format!(
+                "Compiling assets with cache (detected {rake_assets_precompile} and {rake_assets_clean} via {rake_detect_cmd})"
+            ));
 
             let cache_config = [
                 CacheConfig {
@@ -101,7 +107,9 @@ pub(crate) fn rake_assets_install(
                     let removed_len = removed.files.len();
                     let removed_size = removed.adjusted_bytes();
 
-                    print::sub_bullet(format!("Detected cache size exceeded (over {limit} limit by {removed_size}) for {path}"));
+                    print::sub_bullet(format!(
+                        "Detected cache size exceeded (over {limit} limit by {removed_size}) for {path}"
+                    ));
                     print::sub_bullet(format!(
                         "Removed {removed_len} files from the cache for {path}"
                     ));
diff --git a/buildpacks/ruby/tests/integration_test.rs b/buildpacks/ruby/tests/integration_test.rs
@@ -5,8 +5,8 @@
 
 use indoc::{formatdoc, indoc};
 use libcnb_test::{
-    assert_contains, assert_contains_match, assert_empty, BuildConfig, BuildpackReference,
-    ContainerConfig, ContainerContext, TestRunner,
+    BuildConfig, BuildpackReference, ContainerConfig, ContainerContext, TestRunner,
+    assert_contains, assert_contains_match, assert_empty,
 };
 use pretty_assertions::assert_eq;
 use regex::Regex;
diff --git a/commons/src/cache.rs b/commons/src/cache.rs
@@ -3,7 +3,7 @@ mod clean;
 mod config;
 mod error;
 
-pub use self::app_cache::{build, AppCache, CacheState, PathState};
+pub use self::app_cache::{AppCache, CacheState, PathState, build};
 pub use self::clean::FilesWithSize;
-pub use self::config::{mib, CacheConfig, KeepPath};
+pub use self::config::{CacheConfig, KeepPath, mib};
 pub use self::error::CacheError;
diff --git a/commons/src/cache/app_cache.rs b/commons/src/cache/app_cache.rs
@@ -1,4 +1,4 @@
-use crate::cache::clean::{lru_clean, FilesWithSize};
+use crate::cache::clean::{FilesWithSize, lru_clean};
 use crate::cache::{CacheConfig, CacheError, KeepPath};
 use byte_unit::{AdjustedByte, Byte, UnitType};
 use fs_extra::dir::CopyOptions;
diff --git a/commons/src/cache/clean.rs b/commons/src/cache/clean.rs
@@ -147,10 +147,10 @@ mod tests {
     }
 
     fn touch_file(path: &PathBuf, f: impl FnOnce(&PathBuf)) {
-        if let Some(parent) = path.parent() {
-            if !parent.exists() {
-                fs_err::create_dir_all(parent).unwrap();
-            }
+        if let Some(parent) = path.parent()
+            && !parent.exists()
+        {
+            fs_err::create_dir_all(parent).unwrap();
         }
         fs_err::write(path, "").unwrap();
         f(path);
diff --git a/commons/src/cache/error.rs b/commons/src/cache/error.rs
@@ -17,14 +17,18 @@ pub enum CacheError {
         error: fs_extra::error::Error,
     },
 
-    #[error("Could not copy files from the application to cache.\nFrom: {path} To: {cache}\nError: {error}")]
+    #[error(
+        "Could not copy files from the application to cache.\nFrom: {path} To: {cache}\nError: {error}"
+    )]
     CopyAppToCacheError {
         path: PathBuf,
         cache: PathBuf,
         error: fs_extra::error::Error,
     },
 
-    #[error("Could not move files out of the application to the cache.\nFrom: {path} To: {cache}\nError: {error}")]
+    #[error(
+        "Could not move files out of the application to the cache.\nFrom: {path} To: {cache}\nError: {error}"
+    )]
     DestructiveMoveAppToCacheError {
         path: PathBuf,
         cache: PathBuf,
diff --git a/commons/src/layer/diff_migrate.rs b/commons/src/layer/diff_migrate.rs
@@ -418,17 +418,21 @@ mod tests {
             }
         ));
 
-        assert!(context
-            .layers_dir
-            .join(old_layer_name.as_str())
-            .fs_err_try_exists()
-            .unwrap());
-
-        assert!(!context
-            .layers_dir
-            .join(new_layer_name.as_str())
-            .fs_err_try_exists()
-            .unwrap());
+        assert!(
+            context
+                .layers_dir
+                .join(old_layer_name.as_str())
+                .fs_err_try_exists()
+                .unwrap()
+        );
+
+        assert!(
+            !context
+                .layers_dir
+                .join(new_layer_name.as_str())
+                .fs_err_try_exists()
+                .unwrap()
+        );
 
         let result = DiffMigrateLayer {
             build: true,
@@ -447,11 +451,13 @@ mod tests {
         .unwrap();
 
         assert!(matches!(result.state, LayerState::Restored { cause: _ }));
-        assert!(context
-            .layers_dir
-            .join(new_layer_name.as_str())
-            .fs_err_try_exists()
-            .unwrap());
+        assert!(
+            context
+                .layers_dir
+                .join(new_layer_name.as_str())
+                .fs_err_try_exists()
+                .unwrap()
+        );
     }
 
     #[test]
diff --git a/commons/src/metadata_digest.rs b/commons/src/metadata_digest.rs
@@ -380,10 +380,10 @@ impl PathsDigest {
             let mut diff = Vec::new();
 
             for (k, now_sha) in &self.0 {
-                if let Some(old_sha) = old.0.get(k) {
-                    if old_sha != now_sha {
-                        diff.push(k.clone());
-                    }
+                if let Some(old_sha) = old.0.get(k)
+                    && old_sha != now_sha
+                {
+                    diff.push(k.clone());
                 }
             }
 
