From 71b72c4a5378cdf198ba4273e8ff536f9dfa015f Mon Sep 17 00:00:00 2001 From: Blair Noctis <4474501+nc7s@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:42:16 +0800 Subject: [PATCH] Remove dependency on cradle (#2169) --- Cargo.lock | 10 ---------- Cargo.toml | 1 - tests/choose.rs | 8 +++++++- tests/edit.rs | 8 +++++++- tests/fmt.rs | 8 +++++++- tests/lib.rs | 1 - 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2b3e75..5ceb6c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,15 +306,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cradle" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7096122c1023d53de7298f322590170540ad3eba46bbc2750b495f098c27c09a" -dependencies = [ - "rustversion", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -609,7 +600,6 @@ dependencies = [ "clap 4.5.7", "clap_complete", "clap_mangen", - "cradle", "ctrlc", "derivative", "dirs", diff --git a/Cargo.toml b/Cargo.toml index cdb8779..9e9f0e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,6 @@ unicode-width = "0.1.0" uuid = { version = "1.0.0", features = ["v4"] } [dev-dependencies] -cradle = "0.2.0" executable-path = "1.0.0" pretty_assertions = "1.0.0" temptree = "0.2.0" diff --git a/tests/choose.rs b/tests/choose.rs index 0ba1ae3..001b9ae 100644 --- a/tests/choose.rs +++ b/tests/choose.rs @@ -185,7 +185,13 @@ fn status_error() { "exit-2": "#!/usr/bin/env bash\nexit 2\n", }; - ("chmod", "+x", tmp.path().join("exit-2")).run(); + let output = Command::new("chmod") + .arg("+x") + .arg(tmp.path().join("exit-2")) + .output() + .unwrap(); + + assert!(output.status.success()); let path = env::join_paths( iter::once(tmp.path().to_owned()).chain(env::split_paths(&env::var_os("PATH").unwrap())), diff --git a/tests/edit.rs b/tests/edit.rs index d89efdb..2d9840a 100644 --- a/tests/edit.rs +++ b/tests/edit.rs @@ -64,7 +64,13 @@ fn status_error() { "exit-2": "#!/usr/bin/env bash\nexit 2\n", }; - ("chmod", "+x", tmp.path().join("exit-2")).run(); + let output = Command::new("chmod") + .arg("+x") + .arg(tmp.path().join("exit-2")) + .output() + .unwrap(); + + assert!(output.status.success()); let path = env::join_paths( iter::once(tmp.path().to_owned()).chain(env::split_paths(&env::var_os("PATH").unwrap())), diff --git a/tests/fmt.rs b/tests/fmt.rs index 1d70a6f..ba050fc 100644 --- a/tests/fmt.rs +++ b/tests/fmt.rs @@ -126,7 +126,13 @@ fn write_error() { let justfile_path = test.justfile_path(); - ("chmod", "400", &justfile_path).run(); + let output = Command::new("chmod") + .arg("400") + .arg(&justfile_path) + .output() + .unwrap(); + + assert!(output.status.success()); let _tempdir = test.run(); diff --git a/tests/lib.rs b/tests/lib.rs index 292482f..932a6c3 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -5,7 +5,6 @@ pub(crate) use { tempdir::tempdir, test::{assert_eval_eq, Output, Test}, }, - cradle::input::Input, executable_path::executable_path, just::unindent, libc::{EXIT_FAILURE, EXIT_SUCCESS},