From fd3f8afe1a7d34ff00a90f3e3f6f2a4eb3998199 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 9 Sep 2022 13:31:43 -0400 Subject: [PATCH] spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- CHANGELOG.md | 2 +- lib/src/index.rs | 2 +- lib/tests/test_revset.rs | 6 +++--- tests/test_print_command.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15609973a..ccbda5389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -255,7 +255,7 @@ No changes, only trying to get the automated build to work. ### Fixed bugs - - (#131) Fixed crash when `core.excludesFile` pointed to non-existent file, and + - (#131) Fixed crash when `core.excludesFile` pointed to nonexistent file, and made leading `~/` in that config expand to `$HOME/` ## [0.3.0] - 2022-03-12 diff --git a/lib/src/index.rs b/lib/src/index.rs index 15162abca..6e9359eaf 100644 --- a/lib/src/index.rs +++ b/lib/src/index.rs @@ -1744,7 +1744,7 @@ mod tests { index.resolve_prefix(&HexPrefix::new(id_2.hex()).unwrap()), PrefixResolution::SingleMatch(id_2) ); - // Test non-existent commits + // Test nonexistent commits assert_eq!( index.resolve_prefix(&HexPrefix::new("ffffff".to_string()).unwrap()), PrefixResolution::NoMatch diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs index 6f861ff23..b1588ea52 100644 --- a/lib/tests/test_revset.rs +++ b/lib/tests/test_revset.rs @@ -318,10 +318,10 @@ fn test_resolve_symbol_git_refs() { RefTarget::Normal(commit3.id().clone()), ); - // Non-existent ref + // Nonexistent ref assert_eq!( - resolve_symbol(mut_repo.as_repo_ref(), "non-existent", None), - Err(RevsetError::NoSuchRevision("non-existent".to_string())) + resolve_symbol(mut_repo.as_repo_ref(), "nonexistent", None), + Err(RevsetError::NoSuchRevision("nonexistent".to_string())) ); // Full ref diff --git a/tests/test_print_command.rs b/tests/test_print_command.rs index f9e2bc7f3..f428635ca 100644 --- a/tests/test_print_command.rs +++ b/tests/test_print_command.rs @@ -45,7 +45,7 @@ fn test_print() { insta::assert_snapshot!(stdout, @r###" c "###); - let stderr = test_env.jj_cmd_failure(&repo_path, &["print", "non-existent"]); + let stderr = test_env.jj_cmd_failure(&repo_path, &["print", "nonexistent"]); insta::assert_snapshot!(stderr, @r###" Error: No such path "###);