Fix main: clippy on Rust 1.100 stops at shortcuts.rs and the CLI script tests (#2316)

Rust 1.100 marks `ExitCode` as must-use and extends `needless_bool`,
so `cargo clippy --workspace --all-targets -- -D warnings` fails on main:

- `crates/ui-egui/src/shortcuts.rs`: the end of `key_event` returns the
  condition directly instead of `if ... { return true; } false`.
- `apps/figcraft-cli/src/files.rs`: three script tests now assert the exit
  code that `run_script` returns (`SUCCESS` for the two scripts that run,
  1 for the script whose step fails) instead of dropping it.
This commit is contained in:
.CooCoo authored and GitHub committed 2026-11-13 01:38:53 +01:00
1 parent 0d6ce1124c
commit 40360c4a2a
2 files changed
+4 -7

No files matched your search

+3 -3
View File
@@ -670,7 +670,7 @@ mod tests {
)
.unwrap();
let out = dir.join("out.figcraft");
run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
assert_eq!(run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap(), ExitCode::SUCCESS);
let mut s = Session::empty();
s.execute("file.open", &json!({"path": out.to_str().unwrap()})).unwrap();
@@ -700,7 +700,7 @@ mod tests {
)
.unwrap();
let out = dir.join("out.figcraft");
run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
assert_eq!(run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap(), ExitCode::SUCCESS);
let mut s = Session::empty();
s.execute("file.open", &json!({"path": out.to_str().unwrap()})).unwrap();
@@ -737,7 +737,7 @@ mod tests {
.unwrap();
let out = dir.join("out.figcraft");
// The failure is the script's, not the call's: the CLI reports it and exits non-zero.
run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
assert_eq!(run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap(), ExitCode::from(1));
assert!(!out.exists(), "a script that failed writes nothing");
std::fs::remove_dir_all(dir).unwrap();
}
+1 -4
View File
@@ -521,10 +521,7 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
}
return true;
}
if m.is_none() && !repeat && opacity_digit(app, key, now) {
return true;
}
false
m.is_none() && !repeat && opacity_digit(app, key, now)
}
/// Keys while a selection box drawn from the keyboard shows (`select.area`, Alt+Space or Ctrl+Space,