diff --git a/Cargo.lock b/Cargo.lock index 5c3b1cfc..819d25cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -575,9 +575,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", "memchr", diff --git a/nix-script-haskell/src/main.rs b/nix-script-haskell/src/main.rs index b713295c..120c84ad 100644 --- a/nix-script-haskell/src/main.rs +++ b/nix-script-haskell/src/main.rs @@ -7,7 +7,7 @@ fn main() { env_logger::Builder::from_env("NIX_SCRIPT_LOG").init(); let opts = Opts::parse(); - log::trace!("opts: {:?}", opts); + log::trace!("opts: {opts:?}"); match opts.run().map(|status| status.code()) { Ok(Some(code)) => std::process::exit(code), diff --git a/nix-script-haskell/src/opts.rs b/nix-script-haskell/src/opts.rs index c18c0945..3ccd3932 100644 --- a/nix-script-haskell/src/opts.rs +++ b/nix-script-haskell/src/opts.rs @@ -69,7 +69,7 @@ impl Opts { .map(|ps| ps.join(" ")) .unwrap_or_default() ); - log::debug!("build command is `{}`", build_command); + log::debug!("build command is `{build_command}`"); nix_script.arg("--build-command").arg(build_command); let compiler = format!( diff --git a/nix-script/Cargo.toml b/nix-script/Cargo.toml index bc2503cf..acbd4b7f 100644 --- a/nix-script/Cargo.toml +++ b/nix-script/Cargo.toml @@ -15,7 +15,7 @@ nix-script-directives = { path = "../nix-script-directives" } once_cell = "1.21.3" path-absolutize = "3.1.1" seahash = "4.1.0" -serde_json = "1.0.140" +serde_json = "1.0.141" walkdir = "2.5.0" [dev-dependencies] diff --git a/nix-script/src/builder.rs b/nix-script/src/builder.rs index 383df4df..ed95cce3 100644 --- a/nix-script/src/builder.rs +++ b/nix-script/src/builder.rs @@ -157,7 +157,7 @@ impl Builder { .context("could not prepare derivation to build")?; log::debug!("writing derivation to {}", build_path.display()); - log::trace!("derivation contents: {}", derivation); + log::trace!("derivation contents: {derivation}"); fs::write(build_path.join("default.nix"), derivation.to_string()) .context("could not write derivation contents")?; } diff --git a/nix-script/src/derivation.rs b/nix-script/src/derivation.rs index 630ef8fe..5ceadbf9 100644 --- a/nix-script/src/derivation.rs +++ b/nix-script/src/derivation.rs @@ -74,7 +74,7 @@ impl Derivation { pub fn add_build_inputs(&mut self, build_inputs: Vec) { for build_input in build_inputs { if build_input.is_leaf() { - log::trace!("extracting build input `{}`", build_input); + log::trace!("extracting build input `{build_input}`"); self.inputs .insert(build_input.to_string(), Some(format!("pkgs.{build_input}"))); } @@ -107,7 +107,7 @@ impl Derivation { pub fn add_runtime_inputs(&mut self, runtime_inputs: Vec) { for runtime_input in runtime_inputs { if runtime_input.is_leaf() { - log::trace!("extracting build input `{}`", runtime_input); + log::trace!("extracting build input `{runtime_input}`"); self.inputs.insert( runtime_input.to_string(), Some(format!("pkgs.{runtime_input}")), diff --git a/nix-script/src/main.rs b/nix-script/src/main.rs index 0d0f8070..5cbd1317 100644 --- a/nix-script/src/main.rs +++ b/nix-script/src/main.rs @@ -10,7 +10,7 @@ fn main() { env_logger::Builder::from_env("NIX_SCRIPT_LOG").init(); let opts = Opts::parse(); - log::trace!("opts: {:?}", opts); + log::trace!("opts: {opts:?}"); match opts.run().map(|status| status.code()) { Ok(Some(code)) => std::process::exit(code), diff --git a/nix-script/src/opts.rs b/nix-script/src/opts.rs index d9ea7bda..e9f8594c 100644 --- a/nix-script/src/opts.rs +++ b/nix-script/src/opts.rs @@ -255,7 +255,7 @@ impl Opts { // even when another builder has done the job for us in the // meantime. let lock_file_path = env::temp_dir().join(target_unique_id); - log::debug!("creating lock file path: {:?}", lock_file_path); + log::debug!("creating lock file path: {lock_file_path:?}"); let lock_file = File::create(lock_file_path.clone()).context("could not create lock file")?; log::debug!("locking"); @@ -357,17 +357,17 @@ impl Opts { } for input in &directives.build_inputs { - log::trace!("adding build input `{}` to packages", input); + log::trace!("adding build input `{input}` to packages"); command.arg("-p").arg(input.to_string()); } for input in &directives.runtime_inputs { - log::trace!("adding runtime input `{}` to packages", input); + log::trace!("adding runtime input `{input}` to packages"); command.arg("-p").arg(input.to_string()); } if let Some(run) = &self.run { - log::trace!("running `{}`", run); + log::trace!("running `{run}`"); command.arg("--run").arg(run); }