From 8013c2b74db65ebcd2b54fb9155081d020630fe7 Mon Sep 17 00:00:00 2001 From: Ansho Rei Date: Fri, 21 Aug 2026 15:37:11 +0200 Subject: [PATCH] (d8e78cd) Clear the clippy warnings, and bump to 0.8.1 `cargo clippy --all-targets` was reporting 96 warnings, 14 of them in the binary. It is now clean from a cold cache, and the 211 tests still pass. `clippy --fix` took the mechanical ones: needless borrows, `map_or` that is `is_some_and`, `push_str` of a single character, manual `split_once`, and `&PathBuf` parameters in the test fixtures. It also moved the `handlers.rs` test module to the end of the file, which is what `items_after_test_module` was pointing at. Three by hand. `cmd_add` took nine parameters threaded from `main`, and now takes `AddArgs`, which is how `set`, `append` and `check` already pass theirs; the handler destructures it so the body reads as before, and `add --help` is unchanged. The collapsed `if` in `content_trim` needed reindenting, since `--fix` left its body at the old depth. And the two `split_once` rewrites read as `.split_once(..).map(|(_, value)| value)` rather than clippy's `.map(|x| x.1)`. The two eight-argument `create_ticket` test fixtures keep an `allow(too_many_arguments)` carrying the reason: the lint is right that twenty-five positional call sites read as a wall of strings, but replacing them with a named-field struct is a refactor and not a warning sweep. a34a316 tracks it. Co-Authored-By: Claude Opus 5 (1M context) --- AGENTS.md | 2 + Cargo.lock | 2 +- Cargo.toml | 2 +- src/command.rs | 75 +++++++++++++++++-------------- src/handlers.rs | 103 ++++++++++++++++++++++--------------------- src/main.rs | 21 +-------- src/util.rs | 38 ++++++++-------- tests/cmd_add.rs | 42 +++++++++--------- tests/cmd_check.rs | 8 ++-- tests/cmd_comment.rs | 32 +++++++------- tests/cmd_ls.rs | 28 ++++++------ tests/cmd_mv.rs | 41 +++++++++-------- tests/cmd_set.rs | 12 ++--- tests/cmd_show.rs | 37 +++++++++------- tests/cmd_tui.rs | 2 +- 15 files changed, 225 insertions(+), 220 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 8a18ceb..f0363ee 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -34,6 +34,7 @@ and this file is for what someone changing worklane's own code needs. - Tests use `assert_cmd` and `assert_fs` for CLI testing - `setup_worklane()` creates temp `.worklane/` with all four status folders pre-created - `create_ticket()` writes fully-formed markdown files directly (no `--` separator for positional args in test commands) +- **`cargo clippy --all-targets` is clean. Keep it clean**, and do not silence a lint that is pointing at something real. The only two `allow`s in the tree sit on the `create_ticket` fixtures in `cmd_mv.rs` and `cmd_show.rs`, each carrying the reason and what would replace it ## Coding Guidelines @@ -43,6 +44,7 @@ and this file is for what someone changing worklane's own code needs. - Prefer explicit `match` over `unwrap_or_default()` for clarity - Use `unwrap_or_else(|| expr)` for lazy defaults, `unwrap_or(val)` for eager defaults - Use `anyhow!()` with context strings that include identifying info (e.g. UUID, title) not bare values +- A command whose arguments run past a handful takes a clap `Args` struct, not an inline variant with a matching parameter list: `AddArgs`, `SetArgs`, `AppendArgs`, `CheckArgs`. `add` was nine positional parameters threaded from `main` before it became `AddArgs`, and the handler destructures the struct so the body reads the same as before ### CLI Arguments - The prose arguments carry `allow_hyphen_values`, via the `PROSE` constant in `command.rs`: `add --title`, `--description`, `--acceptance`, `--plan`, and the `comment` body. Ticket text quotes flag names constantly, and without it a criterion reading `--print is supported` is parsed as a flag and the whole ticket is refused with nothing written diff --git a/Cargo.lock b/Cargo.lock index e1ca43e..e6272bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1494,7 +1494,7 @@ dependencies = [ [[package]] name = "worklane" -version = "0.8.0" +version = "0.8.1" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index 61ef209..ff82aa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "worklane" -version = "0.8.0" +version = "0.8.1" edition = "2024" [dependencies] diff --git a/src/command.rs b/src/command.rs index 11776ed..306fb38 100644 --- a/src/command.rs +++ b/src/command.rs @@ -70,39 +70,7 @@ pub enum Command { Init, /// Add a new ticket to the backlog - Add { - /// Ticket title - #[arg(short, long, allow_hyphen_values = PROSE)] - title: String, - - /// Ticket description. Use multiple flags to create multiline descriptions. - #[arg(short, long, allow_hyphen_values = PROSE)] - description: Vec, - - /// Acceptance criteria. Accepts multiple flags, each will be interpreted as a single criterium - #[arg(short, long, allow_hyphen_values = PROSE)] - acceptance: Vec, - - /// Implementation plan. Accepts multiple flags, each will be interpreted as a single step - #[arg(short, long, allow_hyphen_values = PROSE)] - plan: Vec, - - /// Tags (comma-separated) - #[arg(short = 'g', long)] - tags: Vec, - - /// Due date (YYYY-MM-DD) - #[arg(long)] - due: Option, - - /// Owner - #[arg(short, long)] - owner: Option, - - /// Priority, 1 (most urgent) to 5 (least). Left unset if omitted. - #[arg(long, value_parser = priority_level)] - priority: Option, - }, + Add(AddArgs), /// List tickets, optionally filtered by status #[command(after_help = PRIORITY_LEGEND.as_str())] @@ -176,6 +144,47 @@ pub enum Command { }, } +/// `add` carries every field a new ticket can hold, so it is a struct rather than an +/// inline variant: nine parameters at the call site is what `too_many_arguments` is +/// for, and `set`, `append` and `check` already pass their arguments this way. +/// +/// No `ArgGroup`: `--title` is required on its own, and everything else is optional +/// because a ticket with only a title is a valid thing to file. +#[derive(clap::Args)] +pub struct AddArgs { + /// Ticket title + #[arg(short, long, allow_hyphen_values = PROSE)] + pub title: String, + + /// Ticket description. Use multiple flags to create multiline descriptions. + #[arg(short, long, allow_hyphen_values = PROSE)] + pub description: Vec, + + /// Acceptance criteria. Accepts multiple flags, each will be interpreted as a single criterium + #[arg(short, long, allow_hyphen_values = PROSE)] + pub acceptance: Vec, + + /// Implementation plan. Accepts multiple flags, each will be interpreted as a single step + #[arg(short, long, allow_hyphen_values = PROSE)] + pub plan: Vec, + + /// Tags (comma-separated) + #[arg(short = 'g', long)] + pub tags: Vec, + + /// Due date (YYYY-MM-DD) + #[arg(long)] + pub due: Option, + + /// Owner + #[arg(short, long)] + pub owner: Option, + + /// Priority, 1 (most urgent) to 5 (least). Left unset if omitted. + #[arg(long, value_parser = priority_level)] + pub priority: Option, +} + /// `set` replaces a field outright. Owner is deliberately absent: `chown` owns that /// field, and status is `mv`'s, so no field has two writers. /// diff --git a/src/handlers.rs b/src/handlers.rs index b821d73..6af9f0b 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -4,7 +4,7 @@ use std::fs; use std::io::{BufRead, IsTerminal, Write}; use std::path::Path; -use crate::command::{AppendArgs, CheckArgs, SetArgs}; +use crate::command::{AddArgs, AppendArgs, CheckArgs, SetArgs}; use crate::install; use crate::util::*; @@ -105,17 +105,18 @@ fn filter_by_priority(items: Vec, level: Option) -> Vec, - owner: &Option, - priority: Option, - start: &Path, -) -> Result<()> { +pub fn cmd_add(args: &AddArgs, start: &Path) -> Result<()> { + let AddArgs { + title, + description, + acceptance, + plan, + tags, + due, + owner, + priority, + } = args; + let owner = match owner { Some(o) => Some(o.clone()), None => get_git_user(), @@ -222,7 +223,7 @@ pub fn read_comments(comments_dir: &Path) -> Result Result Result { for entry in fs::read_dir(dir)? { let entry = entry?; let path = entry.path(); - if !path.extension().map_or(false, |e| e == "md") { + if !path.extension().is_some_and(|e| e == "md") { continue; } @@ -472,7 +475,7 @@ pub fn cmd_mv(ticket_id: &str, target_status: &str, force: bool, start: &Path) - if current_status == target_status { println!( "Ticket is already in '{}' status.", - color_text(&target_status, Color::Orange) + color_text(target_status, Color::Orange) ); return Ok(()); } @@ -506,39 +509,6 @@ pub fn cmd_mv(ticket_id: &str, target_status: &str, force: bool, start: &Path) - Ok(()) } -#[cfg(test)] -mod tests { - use super::*; - - /// The collision path cannot be provoked from the CLI, since two processes - /// will not share a microsecond, but it is the whole point of the guard. - #[test] - fn a_colliding_stem_takes_the_next_name_and_keeps_the_first() { - let dir = std::env::temp_dir().join(format!("worklane-test-{}", uuid::Uuid::new_v4())); - fs::create_dir_all(&dir).unwrap(); - - let first = write_new_comment(&dir, "20260820_143012_123456", "first").unwrap(); - let second = write_new_comment(&dir, "20260820_143012_123456", "second").unwrap(); - let third = write_new_comment(&dir, "20260820_143012_123456", "third").unwrap(); - - assert_eq!(first, "20260820_143012_123456.md"); - assert_eq!(second, "20260820_143012_123456_01.md"); - assert_eq!(third, "20260820_143012_123456_02.md"); - - // Nothing was truncated on the way through - assert_eq!(fs::read_to_string(dir.join(&first)).unwrap(), "first"); - assert_eq!(fs::read_to_string(dir.join(&second)).unwrap(), "second"); - assert_eq!(fs::read_to_string(dir.join(&third)).unwrap(), "third"); - - // read_comments sorts on the stem, so the names must sort in write order - let mut names = vec![second.clone(), third.clone(), first.clone()]; - names.sort(); - assert_eq!(names, vec![first, second, third]); - - fs::remove_dir_all(&dir).unwrap(); - } -} - pub fn cmd_comment( ticket_id: &str, body: &str, @@ -899,3 +869,36 @@ pub fn cmd_install_skill(force: bool, print: bool) -> Result<()> { Ok(()) } + +#[cfg(test)] +mod tests { + use super::*; + + /// The collision path cannot be provoked from the CLI, since two processes + /// will not share a microsecond, but it is the whole point of the guard. + #[test] + fn a_colliding_stem_takes_the_next_name_and_keeps_the_first() { + let dir = std::env::temp_dir().join(format!("worklane-test-{}", uuid::Uuid::new_v4())); + fs::create_dir_all(&dir).unwrap(); + + let first = write_new_comment(&dir, "20260820_143012_123456", "first").unwrap(); + let second = write_new_comment(&dir, "20260820_143012_123456", "second").unwrap(); + let third = write_new_comment(&dir, "20260820_143012_123456", "third").unwrap(); + + assert_eq!(first, "20260820_143012_123456.md"); + assert_eq!(second, "20260820_143012_123456_01.md"); + assert_eq!(third, "20260820_143012_123456_02.md"); + + // Nothing was truncated on the way through + assert_eq!(fs::read_to_string(dir.join(&first)).unwrap(), "first"); + assert_eq!(fs::read_to_string(dir.join(&second)).unwrap(), "second"); + assert_eq!(fs::read_to_string(dir.join(&third)).unwrap(), "third"); + + // read_comments sorts on the stem, so the names must sort in write order + let mut names = vec![second.clone(), third.clone(), first.clone()]; + names.sort(); + assert_eq!(names, vec![first, second, third]); + + fs::remove_dir_all(&dir).unwrap(); + } +} diff --git a/src/main.rs b/src/main.rs index b5afd2a..fcfa586 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,26 +41,7 @@ fn main() -> Result<()> { // No subcommand opens the board, the way a bare `frig` does. None | Some(Command::Tui) => run_tui(&start), Some(Command::Init) => cmd_init(&start), - Some(Command::Add { - title, - description, - acceptance, - plan, - tags, - due, - owner, - priority, - }) => cmd_add( - &title, - &description, - &acceptance, - &plan, - &tags, - &due, - &owner, - priority, - &start, - ), + Some(Command::Add(args)) => cmd_add(&args, &start), Some(Command::Ls { status, priority }) => { let worklane_dir = find_worklane_dir(&start)?; cmd_ls(&status, priority, &worklane_dir) diff --git a/src/util.rs b/src/util.rs index 451a73e..5f9d312 100644 --- a/src/util.rs +++ b/src/util.rs @@ -189,7 +189,7 @@ pub fn slug(title: &str) -> String { pub fn get_git_user() -> Option { std::process::Command::new("git") - .args(&["config", "user.name"]) + .args(["config", "user.name"]) .output() .ok() .and_then(|out| { @@ -256,7 +256,7 @@ pub fn resolve_ticket(search: &str, worklane_dir: &Path) -> Result<(String, Stri let entries = fs::read_dir(&status_path)?; for entry in entries.filter_map(|e| e.ok()) { let path = entry.path(); - if !path.extension().map_or(false, |e| e == "md") { + if !path.extension().is_some_and(|e| e == "md") { continue; } let content = match fs::read_to_string(&path) { @@ -326,16 +326,16 @@ pub fn format_comments_with( } let mut result = String::new(); - result.push_str("\n"); + result.push('\n'); result.push_str(&paint("COMMENTS", Color::Orange, colored)); result.push_str(&format!("\n{}\n", "─".repeat(20))); for (_filename, author, time, body) in comments { - result.push_str("\n"); + result.push('\n'); result.push_str(&paint(&format!("From {} ({})", author, time), Color::Cyan, colored)); - result.push_str("\n"); + result.push('\n'); if !body.is_empty() { - result.push_str(&" ".to_string()); + result.push_str(" "); result.push_str(body); } result.push('\n'); @@ -429,17 +429,19 @@ pub fn content_trim(content: &str, colored: bool) -> String { } // Standard markdown link colorization in cyan - if line.contains("[") && line.contains("(") && line.contains("]") { - if let Some(start) = line.find("[") { - let bracket_text = &line[start..]; - if let Some(end_bracket) = bracket_text.find("](") { - let link_start = start + end_bracket + 1; - if let Some(end) = line[link_start..].find(']') { - let absolute_end = link_start + end + 1; - result.push_str(&paint(&line[start..absolute_end], Color::Cyan, colored)); - result.push('\n'); - continue; - } + if line.contains("[") + && line.contains("(") + && line.contains("]") + && let Some(start) = line.find("[") + { + let bracket_text = &line[start..]; + if let Some(end_bracket) = bracket_text.find("](") { + let link_start = start + end_bracket + 1; + if let Some(end) = line[link_start..].find(']') { + let absolute_end = link_start + end + 1; + result.push_str(&paint(&line[start..absolute_end], Color::Cyan, colored)); + result.push('\n'); + continue; } } } @@ -453,7 +455,7 @@ pub fn content_trim(content: &str, colored: bool) -> String { } pub fn colorize_ordered(line: &str) -> String { - if line.chars().next().map_or(true, |c| !c.is_ascii_digit()) { + if line.chars().next().is_none_or(|c| !c.is_ascii_digit()) { return line.to_string(); } diff --git a/tests/cmd_add.rs b/tests/cmd_add.rs index 65dc2d9..2a6c5db 100644 --- a/tests/cmd_add.rs +++ b/tests/cmd_add.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; use assert_fs::fixture::{PathChild, PathCreateDir}; use assert_fs::TempDir; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); @@ -23,7 +23,7 @@ fn add_creates_ticket_in_backlog() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("add") .args(["--title", "Test ticket"]) .assert() @@ -46,7 +46,7 @@ fn add_formats_ticket_correctly() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args([ "add", "--title", @@ -103,7 +103,7 @@ fn add_joins_multiple_descriptions() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args([ "add", "--title", "Multi desc ticket", @@ -132,7 +132,7 @@ fn add_with_optional_fields_uses_defaults() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Minimal ticket"]) .assert() .success(); @@ -156,13 +156,13 @@ fn add_allows_duplicate_titles() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Existing title"]) .assert() .success(); let mut cmd2 = Command::cargo_bin(BIN_NAME).unwrap(); - cmd2.current_dir(&temp.path()) + cmd2.current_dir(temp.path()) .args(["add", "--title", "Existing title"]) .assert() .success(); @@ -182,7 +182,7 @@ fn add_file_has_uuid_prefix() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "UUID test"]) .assert() .success(); @@ -207,7 +207,7 @@ fn add_writes_the_priority_field() { Command::cargo_bin(BIN_NAME) .unwrap() - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["add", "--title", "Urgent thing", "--priority", "1"]) .assert() .success(); @@ -227,7 +227,7 @@ fn add_leaves_priority_unset_when_omitted() { Command::cargo_bin(BIN_NAME) .unwrap() - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["add", "--title", "Whenever"]) .assert() .success(); @@ -250,7 +250,7 @@ fn add_rejects_a_level_outside_the_range() { // read as a flag. for bad in ["0", "6", "high", "-1"] { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Bad level", &format!("--priority={bad}")]) .assert() .failure(); @@ -272,7 +272,7 @@ fn add_accepts_prose_values_that_begin_with_a_hyphen() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "-t is a flag name"]) .args(["--description", "-x does nothing"]) .args(["--acceptance", "--print should be supported"]) @@ -300,7 +300,7 @@ fn add_still_accepts_the_equals_form() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title=-x equals form"]) .args(["--acceptance=--print via equals"]) .assert() @@ -322,7 +322,7 @@ fn add_stores_a_title_that_is_only_hyphens() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", bare]) .assert() .success(); @@ -344,7 +344,7 @@ fn add_still_rejects_a_mistyped_flag_on_a_non_prose_argument() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Mistyped", flag, "--bogus"]) .assert() .failure(); @@ -363,7 +363,7 @@ fn add_rejects_arguments_after_a_bare_separator() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Sep", "--", "--title", "second"]) .assert() .failure(); @@ -372,7 +372,7 @@ fn add_rejects_arguments_after_a_bare_separator() { assert_eq!(count, 0); } -fn only_ticket(worklane: &PathBuf) -> String { +fn only_ticket(worklane: &Path) -> String { let files: Vec<_> = fs::read_dir(worklane.join("backlog")) .unwrap() .filter_map(|e| e.ok()) @@ -390,7 +390,7 @@ fn add_keeps_a_paragraph_break_in_the_description() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Two Paras"]) .args(["--description", "First paragraph."]) .args(["--description", ""]) @@ -406,7 +406,7 @@ fn add_keeps_a_paragraph_break_in_the_description() { // And it survives the round trip back out let mut show = Command::cargo_bin(BIN_NAME).unwrap(); - show.current_dir(&temp.path()).args(["show", "Two Paras"]); + show.current_dir(temp.path()).args(["show", "Two Paras"]); let stdout = String::from_utf8(show.assert().success().get_output().stdout.clone()).unwrap(); assert!( stdout.contains("First paragraph.\n\nSecond paragraph."), @@ -421,7 +421,7 @@ fn add_discards_blank_descriptions_at_either_end() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Padded"]) .args(["--description", ""]) .args(["--description", " "]) @@ -444,7 +444,7 @@ fn add_treats_an_all_blank_description_as_none() { let worklane = setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["add", "--title", "Blank"]) .args(["--description", ""]) .args(["--description", " "]) diff --git a/tests/cmd_check.rs b/tests/cmd_check.rs index 9b0de75..5124c12 100644 --- a/tests/cmd_check.rs +++ b/tests/cmd_check.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; use assert_fs::TempDir; use assert_fs::fixture::{PathChild, PathCreateDir}; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); const UUID: &str = "475534a3-8a0d-45cb-9a97-39c251dd8e39"; @@ -20,7 +20,7 @@ fn setup_worklane(temp: &TempDir) -> PathBuf { /// One criterion already ticked, one handwritten line inside the section, and a /// checkbox in the description that must not be counted as a criterion. -fn create_ticket(worklane: &PathBuf) { +fn create_ticket(worklane: &Path) { // Written without line continuations on purpose: a trailing `\` strips the next // line's leading whitespace, so the indented line would arrive unindented and the // test would prove nothing about preserving it. @@ -55,11 +55,11 @@ fn create_ticket(worklane: &PathBuf) { fn run(temp: &TempDir, args: &[&str]) -> std::process::Output { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).args(args); + cmd.current_dir(temp.path()).args(args); cmd.assert().get_output().clone() } -fn ticket(worklane: &PathBuf) -> String { +fn ticket(worklane: &Path) -> String { fs::read_to_string(worklane.join("backlog").join(format!("{}_check-me.md", UUID))).unwrap() } diff --git a/tests/cmd_comment.rs b/tests/cmd_comment.rs index 5e6e2b7..8e809ea 100644 --- a/tests/cmd_comment.rs +++ b/tests/cmd_comment.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; use assert_fs::fixture::{PathChild, PathCreateDir}; use assert_fs::TempDir; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); @@ -18,7 +18,7 @@ fn setup_worklane(temp: &TempDir) -> PathBuf { } fn create_ticket( - worklane_dir: &PathBuf, + worklane_dir: &Path, status: &str, title: &str, ) -> String { @@ -53,7 +53,7 @@ fn comment_creates_file_with_valid_ticket_uuid() { let uuid = create_ticket(&worklane, "backlog", "Test Ticket"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "This is a test comment"]) .assert() @@ -78,7 +78,7 @@ fn comment_creates_file_with_valid_ticket_title() { create_ticket(&worklane, "committed", "My Ticket"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args(["My Ticket", "Testing title lookup"]) .assert() @@ -105,7 +105,7 @@ fn comment_includes_git_user_and_body() { let uuid = create_ticket(&worklane, "backlog", "Comment Test"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "My comment body"]) .assert() @@ -129,7 +129,7 @@ fn comment_stored_in_timestamped_file() { let uuid = create_ticket(&worklane, "done", "Timestamp Test"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "Timestamp test"]) .assert() @@ -156,7 +156,7 @@ fn comment_creates_comments_directory() { assert!(!comments_dir.exists()); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "Create dir test"]) .assert() @@ -173,7 +173,7 @@ fn comment_uses_owner_flag_when_provided() { let uuid = create_ticket(&worklane, "backlog", "Owner Test"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "Test comment with owner"]) .arg("-o") @@ -198,7 +198,7 @@ fn comment_falls_back_to_git_user_when_owner_omitted() { let uuid = create_ticket(&worklane, "done", "Fallback Test"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("comment") .args([&uuid, "Test comment fallback"]) .assert() @@ -225,7 +225,7 @@ fn comments_added_back_to_back_are_both_kept() { for body in ["first comment", "second comment", "third comment"] { Command::cargo_bin(BIN_NAME) .unwrap() - .current_dir(&temp.path()) + .current_dir(temp.path()) .arg("comment") .args([&uuid, body]) .assert() @@ -241,7 +241,7 @@ fn comments_added_back_to_back_are_both_kept() { // And show has to render them in the order they were added let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg(&uuid); + cmd.current_dir(temp.path()).arg("show").arg(&uuid); let assert = cmd.assert().success(); let stdout = String::from_utf8(assert.get_output().stdout.clone()).unwrap(); @@ -261,7 +261,7 @@ fn comment_accepts_a_body_that_begins_with_a_hyphen() { for body in ["--print is the flag I mean", "-f skips the check", "-"] { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["comment", &uuid, body]) .assert() .success(); @@ -289,13 +289,13 @@ fn comment_needs_a_separator_for_a_hyphen_leading_ticket() { let mut without = Command::cargo_bin(BIN_NAME).unwrap(); without - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["comment", "-leading", "a body"]) .assert() .failure(); let mut with = Command::cargo_bin(BIN_NAME).unwrap(); - with.current_dir(&temp.path()) + with.current_dir(temp.path()) .args(["comment", "--", "-leading", "a body"]) .assert() .success(); @@ -315,7 +315,7 @@ fn a_bare_double_hyphen_body_needs_a_separator() { let mut without = Command::cargo_bin(BIN_NAME).unwrap(); let assert = without - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["comment", &uuid, "--"]) .assert() .failure(); @@ -327,7 +327,7 @@ fn a_bare_double_hyphen_body_needs_a_separator() { ); let mut with = Command::cargo_bin(BIN_NAME).unwrap(); - with.current_dir(&temp.path()) + with.current_dir(temp.path()) .args(["comment", &uuid, "--", "--"]) .assert() .success(); diff --git a/tests/cmd_ls.rs b/tests/cmd_ls.rs index a47def2..2a47efb 100644 --- a/tests/cmd_ls.rs +++ b/tests/cmd_ls.rs @@ -17,7 +17,7 @@ fn setup_worklane(temp: &TempDir) -> std::path::PathBuf { } fn create_ticket( - worklane_dir: &std::path::PathBuf, + worklane_dir: &std::path::Path, status: &str, title: &str, owner: &str, @@ -71,7 +71,7 @@ fn ls_without_status_shows_overview() { create_ticket(&worklane, "done", "Feature D", "dave", "2026-09-01"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").assert().success(); + cmd.current_dir(temp.path()).arg("ls").assert().success(); let stdout = get_stdout(&mut cmd); assert!(stdout.contains("BACKLOG")); @@ -94,7 +94,7 @@ fn ls_with_status_filters_tickets() { create_ticket(&worklane, "reviewing", "Feature C", "charlie", "2026-08-01"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").args(["committed"]); + cmd.current_dir(temp.path()).arg("ls").args(["committed"]); cmd.assert().success(); @@ -107,7 +107,7 @@ fn ls_with_invalid_status_fails() { let temp = TempDir::new().unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("ls") .args(["nonexistent"]) .assert() @@ -124,7 +124,7 @@ fn ls_listed_tickets_sorted_alphabetically() { create_ticket(&worklane, "backlog", "Mango", "charlie", "2026-08-01"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("ls") .args(["backlog"]) .assert() @@ -146,7 +146,7 @@ fn ls_empty_status_shows_message() { // Intentionally leave "done" empty let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("ls") .args(["done"]) .assert() @@ -164,7 +164,7 @@ fn ls_displays_owner_and_due() { create_ticket(&worklane, "backlog", "Test ticket", "alice", "2026-12-31"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("ls") .args(["backlog"]) .assert() @@ -191,7 +191,7 @@ fn ls_handles_short_and_non_ascii_filenames() { } let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").arg("backlog").assert().success(); + cmd.current_dir(temp.path()).arg("ls").arg("backlog").assert().success(); let stdout = get_stdout(&mut cmd); assert_eq!(stdout.matches("Odd Name").count(), 3); @@ -209,7 +209,7 @@ fn ls_survives_a_malformed_created_at() { .unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").arg("backlog").assert().success(); + cmd.current_dir(temp.path()).arg("ls").arg("backlog").assert().success(); let stdout = get_stdout(&mut cmd); assert!(stdout.contains("Bad Date")); @@ -217,7 +217,7 @@ fn ls_survives_a_malformed_created_at() { assert!(!stdout.contains("日本語")); } -fn create_ticket_with_priority(worklane_dir: &std::path::PathBuf, title: &str, priority: &str) { +fn create_ticket_with_priority(worklane_dir: &std::path::Path, title: &str, priority: &str) { let slug: String = title.to_lowercase().replace(' ', "-"); let body = format!( "# {}\n\n## Metadata\n\n- **ID**: 00000000-0000-0000-0000-00000000000{}\n\ @@ -242,7 +242,7 @@ fn ls_sorts_by_priority_then_title() { create_ticket(&worklane, "backlog", "No priority at all", "alice", "_Not set_"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").arg("backlog"); + cmd.current_dir(temp.path()).arg("ls").arg("backlog"); let stdout = get_stdout(&mut cmd); let at = |needle: &str| stdout.find(needle).unwrap_or_else(|| panic!("{needle} missing")); @@ -261,7 +261,7 @@ fn ls_filters_by_priority_and_composes_with_status() { create_ticket_with_priority(&worklane, "Lower one", "3"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["ls", "backlog", "--priority", "1"]); let stdout = get_stdout(&mut cmd); assert!(stdout.contains("Urgent one")); @@ -269,7 +269,7 @@ fn ls_filters_by_priority_and_composes_with_status() { // Same filter without a status, through the grouped listing let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).args(["ls", "--priority", "3"]); + cmd.current_dir(temp.path()).args(["ls", "--priority", "3"]); let stdout = get_stdout(&mut cmd); assert!(stdout.contains("Lower one")); assert!(!stdout.contains("Urgent one")); @@ -285,7 +285,7 @@ fn ls_shows_a_mark_for_the_level() { create_ticket(&worklane, "backlog", "Nothing set", "alice", "_Not set_"); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("ls").arg("backlog"); + cmd.current_dir(temp.path()).arg("ls").arg("backlog"); let stdout = get_stdout(&mut cmd); // Piped, so no escapes: the glyph is carrying the level by itself diff --git a/tests/cmd_mv.rs b/tests/cmd_mv.rs index ea8150d..2e51378 100644 --- a/tests/cmd_mv.rs +++ b/tests/cmd_mv.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; use assert_fs::TempDir; use assert_fs::fixture::{PathChild, PathCreateDir}; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); @@ -17,8 +17,13 @@ fn setup_worklane(temp: &TempDir) -> PathBuf { worklane.path().to_path_buf() } +/// Every metadata field a ticket has, positionally. The lint is right that the call +/// site reads as a wall of strings, and the fix is a struct with named fields, but +/// that is a change to thirteen call sites in this file alone and belongs in its own +/// commit rather than in a warning sweep. +#[allow(clippy::too_many_arguments)] fn create_ticket( - worklane_dir: &PathBuf, + worklane_dir: &Path, status: &str, title: &str, description: &str, @@ -89,7 +94,7 @@ fn mv_forwards_from_backlog_to_committed() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -133,7 +138,7 @@ fn mv_blocks_backward_move() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -163,7 +168,7 @@ fn mv_allows_backward_move_with_force() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -197,7 +202,7 @@ fn mv_blocks_nonsequential_forward_move() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -227,7 +232,7 @@ fn mv_allows_skipping_stages_with_force() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -259,7 +264,7 @@ fn mv_ignores_already_in_same_status() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -290,7 +295,7 @@ fn mv_rejects_invalid_status() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -320,7 +325,7 @@ fn mv_uses_ticket_id_for_resolution() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -354,7 +359,7 @@ fn mv_keeps_status_in_sync_across_consecutive_moves() { for target in ["committed", "reviewing"] { Command::cargo_bin(BIN_NAME) .unwrap() - .current_dir(&temp.path()) + .current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -392,7 +397,7 @@ fn mv_repairs_legacy_status_field() { Command::cargo_bin(BIN_NAME) .unwrap() - .current_dir(&temp.path()) + .current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -415,7 +420,7 @@ fn mv_fails_when_status_field_is_missing() { fs::write(&path, "# No Status\n\n## Metadata\n\n- **Owner**: jack\n").unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("mv") .arg("abc123def4567") .arg("--status") @@ -498,7 +503,7 @@ fn mv_never_leaves_stale_content_in_the_target_directory() { chmod(&source, 0o444); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["mv", "abc123def4567", "--status", "committed"]) .assert() .success(); @@ -541,7 +546,7 @@ fn mv_leaves_the_ticket_in_one_place_when_the_move_fails() { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); let assert = cmd - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["mv", "abc123def4567", "--status", "committed"]) .assert() .failure(); @@ -569,7 +574,7 @@ fn mv_leaves_the_ticket_in_one_place_when_the_move_fails() { let mut retry = Command::cargo_bin(BIN_NAME).unwrap(); retry - .current_dir(&temp.path()) + .current_dir(temp.path()) .args(["mv", "abc123def4567", "--status", "committed"]) .assert() .success(); @@ -595,7 +600,7 @@ fn mv_leaves_nothing_behind_on_success() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["mv", "abc123def4567", "--status", "committed"]) .assert() .success(); @@ -625,7 +630,7 @@ fn mv_moves_the_resolved_ticket_when_two_share_a_title() { } let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .args(["mv", "22222222", "--status", "committed"]) .assert() .success(); diff --git a/tests/cmd_set.rs b/tests/cmd_set.rs index ed1d958..94847e5 100644 --- a/tests/cmd_set.rs +++ b/tests/cmd_set.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; use assert_fs::TempDir; use assert_fs::fixture::{PathChild, PathCreateDir}; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); const UUID: &str = "475534a3-8a0d-45cb-9a97-39c251dd8e39"; @@ -20,7 +20,7 @@ fn setup_worklane(temp: &TempDir) -> PathBuf { /// A fully populated ticket, with one criterion already ticked and a section the tool /// knows nothing about, so every test can check both survive. -fn create_ticket(worklane: &PathBuf) -> String { +fn create_ticket(worklane: &Path) -> String { let filename = format!("{}_original-title.md", UUID); fs::write( worklane.join("backlog").join(&filename), @@ -61,11 +61,11 @@ fn create_ticket(worklane: &PathBuf) -> String { fn run(temp: &TempDir, args: &[&str]) -> std::process::Output { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).args(args); + cmd.current_dir(temp.path()).args(args); cmd.assert().get_output().clone() } -fn ticket(worklane: &PathBuf) -> String { +fn ticket(worklane: &Path) -> String { let entry = fs::read_dir(worklane.join("backlog")) .unwrap() .filter_map(|e| e.ok()) @@ -74,7 +74,7 @@ fn ticket(worklane: &PathBuf) -> String { fs::read_to_string(entry.path()).unwrap() } -fn stray_files(worklane: &PathBuf) -> Vec { +fn stray_files(worklane: &Path) -> Vec { fs::read_dir(worklane) .unwrap() .filter_map(|e| e.ok()) @@ -327,7 +327,7 @@ fn append_replaces_an_empty_section_rather_than_following_its_placeholder() { let worklane = setup_worklane(&temp); let mut add = Command::cargo_bin(BIN_NAME).unwrap(); - add.current_dir(&temp.path()) + add.current_dir(temp.path()) .args(["add", "--title", "Bare ticket"]) .assert() .success(); diff --git a/tests/cmd_show.rs b/tests/cmd_show.rs index 46931b9..66d8619 100644 --- a/tests/cmd_show.rs +++ b/tests/cmd_show.rs @@ -16,8 +16,11 @@ fn setup_worklane(temp: &TempDir) -> std::path::PathBuf { worklane.path().to_path_buf() } +/// Same fixture, same trade as `cmd_mv.rs`: positional today, a struct when the call +/// sites in both files are converted together. +#[allow(clippy::too_many_arguments)] fn create_ticket( - worklane_dir: &std::path::PathBuf, + worklane_dir: &std::path::Path, status: &str, title: &str, description: &str, @@ -86,7 +89,7 @@ fn show_displays_ticket_by_full_uuid() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("abc123def456789012345678901234567890") .assert() @@ -118,7 +121,7 @@ fn show_displays_ticket_by_partial_uuid() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("abc123def4567890") .assert() @@ -147,7 +150,7 @@ fn show_displays_ticket_by_title() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("login") .assert() @@ -178,7 +181,7 @@ fn show_displays_ticket_by_partial_title() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("fix") .assert() @@ -206,7 +209,7 @@ fn show_shows_both_uuid_and_title_in_output() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("test") .assert() @@ -222,7 +225,7 @@ fn show_fails_for_nonexistent_ticket() { setup_worklane(&temp); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("nonexistent") .assert() @@ -259,7 +262,7 @@ fn show_asks_for_disambiguation_when_multiple_matches() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("est"); + cmd.current_dir(temp.path()).arg("show").arg("est"); let stderr = get_stderr(&mut cmd); assert!(stderr.contains("Multiple tickets found")); @@ -299,7 +302,7 @@ fn show_reports_ambiguity_on_stderr_with_a_failing_exit() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("ambiguous") .assert() @@ -333,7 +336,7 @@ fn show_disambiguates_tickets_with_short_filenames() { .unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("short"); + cmd.current_dir(temp.path()).arg("show").arg("short"); let stderr = get_stderr(&mut cmd); assert!(stderr.contains("Multiple tickets found")); @@ -356,7 +359,7 @@ fn show_disambiguates_tickets_with_non_ascii_filenames() { } let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("accented"); + cmd.current_dir(temp.path()).arg("show").arg("accented"); let stderr = get_stderr(&mut cmd); assert!(stderr.contains("Multiple tickets found")); @@ -383,7 +386,7 @@ fn show_searches_across_all_statuses() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()) + cmd.current_dir(temp.path()) .arg("show") .arg("committed") .assert() @@ -408,7 +411,7 @@ fn show_renders_the_priority_mark_beside_the_number() { .unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("Prio"); + cmd.current_dir(temp.path()).arg("show").arg("Prio"); let stdout = get_stdout(&mut cmd); // Mark for the eye, number still there for the file's sake @@ -438,7 +441,7 @@ fn show_prints_the_title_once() { ); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("Once Only"); + cmd.current_dir(temp.path()).arg("show").arg("Once Only"); let stdout = get_stdout(&mut cmd); assert_eq!( @@ -467,7 +470,7 @@ fn show_renders_the_metadata_as_an_aligned_table() { .unwrap(); let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg("Table"); + cmd.current_dir(temp.path()).arg("show").arg("Table"); let stdout = get_stdout(&mut cmd); // Every value starts in the same column, sized by the longest field name @@ -500,7 +503,7 @@ fn ticket_with(worklane: &std::path::Path, status: &str, uuid: &str, title: &str fn show(temp: &TempDir, search: &str) -> std::process::Output { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).arg("show").arg(search); + cmd.current_dir(temp.path()).arg("show").arg(search); cmd.assert().get_output().clone() } @@ -546,7 +549,7 @@ fn show_resolves_the_short_id_the_listing_prints() { ticket_with(&worklane, "backlog", uuid, "Alpha", "alpha"); let mut ls = Command::cargo_bin(BIN_NAME).unwrap(); - ls.current_dir(&temp.path()).args(["ls", "backlog"]); + ls.current_dir(temp.path()).args(["ls", "backlog"]); let listing = String::from_utf8(ls.assert().success().get_output().stdout.clone()).unwrap(); // Take the id exactly as printed, so this couples to the display width rather diff --git a/tests/cmd_tui.rs b/tests/cmd_tui.rs index 610b2a7..a6db4f4 100644 --- a/tests/cmd_tui.rs +++ b/tests/cmd_tui.rs @@ -15,7 +15,7 @@ fn setup_worklane(temp: &TempDir) { fn run(temp: &TempDir, args: &[&str]) -> std::process::Output { let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); - cmd.current_dir(&temp.path()).args(args); + cmd.current_dir(temp.path()).args(args); cmd.assert().get_output().clone() }