From ded9d1cedb1808fb91b0b6f2f8dea5035b5183a9 Mon Sep 17 00:00:00 2001 From: JT <547158+jntrnr@users.noreply.github.com> Date: Thu, 21 Apr 2022 12:08:12 +1200 Subject: [PATCH] Some cleanups for clippy (#5266) --- crates/nu-cli/tests/test_completions.rs | 25 +++++++++----------- crates/nu-command/tests/commands/query/db.rs | 5 ---- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/crates/nu-cli/tests/test_completions.rs b/crates/nu-cli/tests/test_completions.rs index 83fc6e7770..243f4daec4 100644 --- a/crates/nu-cli/tests/test_completions.rs +++ b/crates/nu-cli/tests/test_completions.rs @@ -15,7 +15,7 @@ fn file_completions() { let stack = Stack::new(); // Instatiate a new completer - let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack.clone()); + let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack); // Test completions for the current folder let target_dir = format!("cd {}", dir_str); @@ -23,23 +23,23 @@ fn file_completions() { // Create the expected values let expected_paths: Vec = vec![ - file(dir.clone().join("nushell")), - folder(dir.clone().join("test_a")), - folder(dir.clone().join("test_b")), - folder(dir.clone().join("another")), - file(dir.clone().join(".hidden_file")), - folder(dir.clone().join(".hidden_folder")), + file(dir.join("nushell")), + folder(dir.join("test_a")), + folder(dir.join("test_b")), + folder(dir.join("another")), + file(dir.join(".hidden_file")), + folder(dir.join(".hidden_folder")), ]; // Match the results match_suggestions(expected_paths, suggestions); // Test completions for the completions/another folder - let target_dir = format!("cd {}", folder(dir.clone().join("another"))); + let target_dir = format!("cd {}", folder(dir.join("another"))); let suggestions = completer.complete(&target_dir, target_dir.len()); // Create the expected values - let expected_paths: Vec = vec![file(dir.clone().join("another").join("newfile"))]; + let expected_paths: Vec = vec![file(dir.join("another").join("newfile"))]; // Match the results match_suggestions(expected_paths, suggestions); @@ -53,7 +53,7 @@ fn new_engine() -> (PathBuf, String, EngineState) { .clone() .into_os_string() .into_string() - .unwrap_or("".to_string()); + .unwrap_or_default(); dir_str.push(SEP); // Create a default engine @@ -77,8 +77,5 @@ fn folder(path: PathBuf) -> String { // convert a given path to string fn file(path: PathBuf) -> String { - path.clone() - .into_os_string() - .into_string() - .unwrap_or("".to_string()) + path.into_os_string().into_string().unwrap_or_default() } diff --git a/crates/nu-command/tests/commands/query/db.rs b/crates/nu-command/tests/commands/query/db.rs index a7a854ca13..ad5f8638b1 100644 --- a/crates/nu-command/tests/commands/query/db.rs +++ b/crates/nu-command/tests/commands/query/db.rs @@ -40,8 +40,3 @@ fn invalid_input_fails() { assert!(actual.err.contains("pipeline_mismatch")); } - -#[test] -fn scratch() { - assert!(true); -}