Fix clippy and track in CI

`flake check` will run clippy.
This commit is contained in:
John Ericson 2025-12-15 19:48:30 -05:00
parent 654addc555
commit 351a206776
13 changed files with 82 additions and 50 deletions

View file

@ -138,7 +138,7 @@ impl FlakeReference {
}?;
let ptr = NonNull::new(ptr)
.context("flake_reference_and_fragment_from_string unexpectedly returned null")?;
Ok((FlakeReference { ptr: ptr }, r?))
Ok((FlakeReference { ptr }, r?))
}
}
@ -293,7 +293,7 @@ mod tests {
let b = eval_state.require_bool(&v).unwrap();
assert_eq!(b, true);
assert!(b);
drop(gc_registration);
}
@ -353,7 +353,7 @@ mod tests {
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "potato");
@ -394,7 +394,7 @@ mod tests {
// a
std::fs::write(
&tmp_dir.path().join("a/flake.nix"),
tmp_dir.path().join("a/flake.nix"),
r#"
{
inputs.b.url = "@flake_dir_b@";
@ -409,7 +409,7 @@ mod tests {
// b
std::fs::write(
&tmp_dir.path().join("b/flake.nix"),
tmp_dir.path().join("b/flake.nix"),
r#"
{
outputs = { ... }: {
@ -422,7 +422,7 @@ mod tests {
// c
std::fs::write(
&tmp_dir.path().join("c/flake.nix"),
tmp_dir.path().join("c/flake.nix"),
r#"
{
outputs = { ... }: {
@ -486,7 +486,7 @@ mod tests {
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "BOB");
@ -527,7 +527,7 @@ mod tests {
let outputs = locked_flake
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "BOB");
@ -547,7 +547,7 @@ mod tests {
let outputs = locked_flake
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "BOB");
@ -581,7 +581,7 @@ mod tests {
let outputs = locked_flake
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "Claire");
@ -604,7 +604,7 @@ mod tests {
let outputs = locked_flake
.outputs(&flake_settings, &mut eval_state)
.unwrap();
let hello = eval_state.require_attrs_select(&outputs, &"hello").unwrap();
let hello = eval_state.require_attrs_select(&outputs, "hello").unwrap();
let hello = eval_state.require_string(&hello).unwrap();
assert_eq!(hello, "BOB");