Skip to content

Bump serde_json from 1.0.140 to 1.0.141 #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2025
Merged

Bump serde_json from 1.0.140 to 1.0.141 #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71ddc9e
Bump serde_json from 1.0.140 to 1.0.141
dependabot[bot] Jul 28, 2025
4136d29
fix various clippy warnings
dschrempf Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix-script-haskell/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion nix-script-haskell/src/opts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
Expand Down
2 changes: 1 addition & 1 deletion nix-script/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion nix-script/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")?;
}
Expand Down
4 changes: 2 additions & 2 deletions nix-script/src/derivation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl Derivation {
pub fn add_build_inputs(&mut self, build_inputs: Vec<Expr>) {
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}")));
}
Expand Down Expand Up @@ -107,7 +107,7 @@ impl Derivation {
pub fn add_runtime_inputs(&mut self, runtime_inputs: Vec<Expr>) {
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}")),
Expand Down
2 changes: 1 addition & 1 deletion nix-script/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions nix-script/src/opts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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);
}

Expand Down
Loading