Skip to content

Commit b0839e9

Browse files
authored
Merge pull request #269 from dschrempf/dependabot/cargo/serde_json-1.0.141
Bump serde_json from 1.0.140 to 1.0.141
2 parents b29aa94 + 4136d29 commit b0839e9

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix-script-haskell/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fn main() {
77
env_logger::Builder::from_env("NIX_SCRIPT_LOG").init();
88

99
let opts = Opts::parse();
10-
log::trace!("opts: {:?}", opts);
10+
log::trace!("opts: {opts:?}");
1111

1212
match opts.run().map(|status| status.code()) {
1313
Ok(Some(code)) => std::process::exit(code),

nix-script-haskell/src/opts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl Opts {
6969
.map(|ps| ps.join(" "))
7070
.unwrap_or_default()
7171
);
72-
log::debug!("build command is `{}`", build_command);
72+
log::debug!("build command is `{build_command}`");
7373
nix_script.arg("--build-command").arg(build_command);
7474

7575
let compiler = format!(

nix-script/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nix-script-directives = { path = "../nix-script-directives" }
1515
once_cell = "1.21.3"
1616
path-absolutize = "3.1.1"
1717
seahash = "4.1.0"
18-
serde_json = "1.0.140"
18+
serde_json = "1.0.141"
1919
walkdir = "2.5.0"
2020

2121
[dev-dependencies]

nix-script/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl Builder {
157157
.context("could not prepare derivation to build")?;
158158

159159
log::debug!("writing derivation to {}", build_path.display());
160-
log::trace!("derivation contents: {}", derivation);
160+
log::trace!("derivation contents: {derivation}");
161161
fs::write(build_path.join("default.nix"), derivation.to_string())
162162
.context("could not write derivation contents")?;
163163
}

nix-script/src/derivation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl Derivation {
7474
pub fn add_build_inputs(&mut self, build_inputs: Vec<Expr>) {
7575
for build_input in build_inputs {
7676
if build_input.is_leaf() {
77-
log::trace!("extracting build input `{}`", build_input);
77+
log::trace!("extracting build input `{build_input}`");
7878
self.inputs
7979
.insert(build_input.to_string(), Some(format!("pkgs.{build_input}")));
8080
}
@@ -107,7 +107,7 @@ impl Derivation {
107107
pub fn add_runtime_inputs(&mut self, runtime_inputs: Vec<Expr>) {
108108
for runtime_input in runtime_inputs {
109109
if runtime_input.is_leaf() {
110-
log::trace!("extracting build input `{}`", runtime_input);
110+
log::trace!("extracting build input `{runtime_input}`");
111111
self.inputs.insert(
112112
runtime_input.to_string(),
113113
Some(format!("pkgs.{runtime_input}")),

nix-script/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() {
1010
env_logger::Builder::from_env("NIX_SCRIPT_LOG").init();
1111

1212
let opts = Opts::parse();
13-
log::trace!("opts: {:?}", opts);
13+
log::trace!("opts: {opts:?}");
1414

1515
match opts.run().map(|status| status.code()) {
1616
Ok(Some(code)) => std::process::exit(code),

nix-script/src/opts.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ impl Opts {
255255
// even when another builder has done the job for us in the
256256
// meantime.
257257
let lock_file_path = env::temp_dir().join(target_unique_id);
258-
log::debug!("creating lock file path: {:?}", lock_file_path);
258+
log::debug!("creating lock file path: {lock_file_path:?}");
259259
let lock_file =
260260
File::create(lock_file_path.clone()).context("could not create lock file")?;
261261
log::debug!("locking");
@@ -357,17 +357,17 @@ impl Opts {
357357
}
358358

359359
for input in &directives.build_inputs {
360-
log::trace!("adding build input `{}` to packages", input);
360+
log::trace!("adding build input `{input}` to packages");
361361
command.arg("-p").arg(input.to_string());
362362
}
363363

364364
for input in &directives.runtime_inputs {
365-
log::trace!("adding runtime input `{}` to packages", input);
365+
log::trace!("adding runtime input `{input}` to packages");
366366
command.arg("-p").arg(input.to_string());
367367
}
368368

369369
if let Some(run) = &self.run {
370-
log::trace!("running `{}`", run);
370+
log::trace!("running `{run}`");
371371
command.arg("--run").arg(run);
372372
}
373373

0 commit comments

Comments
 (0)