diff --git a/crates/cargo-test-support/src/git.rs b/crates/cargo-test-support/src/git.rs index 2b838e8c991..9863c5045ba 100644 --- a/crates/cargo-test-support/src/git.rs +++ b/crates/cargo-test-support/src/git.rs @@ -38,7 +38,7 @@ use some of the helper functions in this file to interact with the repository. */ -use crate::{path2url, project, Project, ProjectBuilder, SymlinkBuilder}; +use crate::{paths::CargoPathExt, project, Project, ProjectBuilder, SymlinkBuilder}; use std::fs; use std::path::{Path, PathBuf}; use std::sync::Once; @@ -118,7 +118,7 @@ impl Repository { } pub fn url(&self) -> Url { - path2url(self.0.workdir().unwrap().to_path_buf()) + self.0.workdir().unwrap().to_url() } pub fn revparse_head(&self) -> String { diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 9f6d12077f9..17632fc770e 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -74,6 +74,7 @@ pub mod tools; pub mod prelude { pub use crate::cargo_test; + pub use crate::paths::CargoPathExt; pub use crate::ArgLine; pub use crate::CargoCommand; pub use crate::ChannelChanger; @@ -339,7 +340,8 @@ impl Project { /// File url for root, ex: `file:///path/to/cargo/target/cit/t0/foo` pub fn url(&self) -> Url { - path2url(self.root()) + use paths::CargoPathExt; + self.root().to_url() } /// Path to an example built as a library. @@ -1184,10 +1186,6 @@ pub fn basic_lib_manifest(name: &str) -> String { ) } -pub fn path2url>(p: P) -> Url { - Url::from_file_path(p).ok().unwrap() -} - struct RustcInfo { verbose_version: String, host: String, diff --git a/crates/cargo-test-support/src/paths.rs b/crates/cargo-test-support/src/paths.rs index 806810b87a8..1cd5b5b0831 100644 --- a/crates/cargo-test-support/src/paths.rs +++ b/crates/cargo-test-support/src/paths.rs @@ -111,6 +111,8 @@ pub fn home() -> PathBuf { } pub trait CargoPathExt { + fn to_url(&self) -> url::Url; + fn rm_rf(&self); fn mkdir_p(&self); @@ -132,6 +134,10 @@ pub trait CargoPathExt { } impl CargoPathExt for Path { + fn to_url(&self) -> url::Url { + url::Url::from_file_path(self).ok().unwrap() + } + fn rm_rf(&self) { let meta = match self.symlink_metadata() { Ok(meta) => meta, @@ -211,6 +217,30 @@ impl CargoPathExt for Path { } } +impl CargoPathExt for PathBuf { + fn to_url(&self) -> url::Url { + self.as_path().to_url() + } + + fn rm_rf(&self) { + self.as_path().rm_rf() + } + fn mkdir_p(&self) { + self.as_path().mkdir_p() + } + + fn ls_r(&self) -> Vec { + self.as_path().ls_r() + } + + fn move_in_time(&self, travel_amount: F) + where + F: Fn(i64, u32) -> (i64, u32), + { + self.as_path().move_in_time(travel_amount) + } +} + fn do_op(path: &Path, desc: &str, mut f: F) where F: FnMut(&Path) -> io::Result<()>, diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index 2b3554de75f..e84d93d7428 100644 --- a/tests/testsuite/bench.rs +++ b/tests/testsuite/bench.rs @@ -1,6 +1,5 @@ //! Tests for the `cargo bench` command. -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project, str}; diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 6ac9b30de8a..d18afd6568b 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -12,7 +12,7 @@ use cargo::{ GlobalContext, }; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::paths::{root, CargoPathExt}; +use cargo_test_support::paths::root; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 34a62a17349..dad106862e8 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -7,7 +7,6 @@ use std::thread; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::cargo_home; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/cache_lock.rs b/tests/testsuite/cache_lock.rs index 49468a2f957..3f3710fc799 100644 --- a/tests/testsuite/cache_lock.rs +++ b/tests/testsuite/cache_lock.rs @@ -3,7 +3,7 @@ use std::thread::JoinHandle; use cargo::util::cache_lock::{CacheLockMode, CacheLocker}; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::{retry, thread_wait_timeout, threaded_timeout}; diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index 4bbe4e38830..6b546a6fbad 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -8,7 +8,6 @@ use std::process::Stdio; use std::str; use cargo_test_support::basic_manifest; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index b3377b1f88f..d9911ee7400 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -4,7 +4,6 @@ use std::fmt::{self, Write}; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::exe; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs index 6c7917eb5ab..f6cbddb0156 100644 --- a/tests/testsuite/clean.rs +++ b/tests/testsuite/clean.rs @@ -1,6 +1,5 @@ //! Tests for the `cargo clean` command. -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index 451506c83e9..39d55815b17 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -6,7 +6,7 @@ use std::path::Path; use std::str; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 274c33b8021..713c841c5ad 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -4,7 +4,6 @@ use std::fs; use std::str; use cargo::core::compiler::RustDocFingerprint; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs index 1213c4a5574..f821395e34a 100644 --- a/tests/testsuite/features.rs +++ b/tests/testsuite/features.rs @@ -1,6 +1,5 @@ //! Tests for `[features]` table. -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index 164a0ca27d3..06d56a26274 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -4,7 +4,6 @@ use std::fs::File; use cargo_test_support::cross_compile::{self, alternate}; use cargo_test_support::install::cargo_home; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::publish::validate_crate_contents; use cargo_test_support::registry::{Dependency, Package}; diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs index e6d0544ab54..7ebab59f858 100644 --- a/tests/testsuite/fix.rs +++ b/tests/testsuite/fix.rs @@ -3,7 +3,7 @@ use cargo::core::Edition; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git::{self, init}; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index c317afd48ab..37c6e7b21db 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -9,7 +9,7 @@ use std::process::Stdio; use std::thread; use std::time::SystemTime; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index eee52795622..ac7a4348415 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -10,11 +10,11 @@ use std::sync::Arc; use std::thread; use cargo_test_support::git::cargo_uses_gitoxide; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::IntoData; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; -use cargo_test_support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project}; +use cargo_test_support::{basic_lib_manifest, basic_manifest, git, main_file, project}; use cargo_test_support::{sleep_ms, str, t, Project}; #[cargo_test] @@ -878,7 +878,7 @@ fn dep_with_submodule() { let git_project2 = git::new("dep2", |project| project.file("lib.rs", "pub fn dep() {}")); let repo = git2::Repository::open(&git_project.root()).unwrap(); - let url = path2url(git_project2.root()).to_string(); + let url = git_project2.root().to_url().to_string(); git::add_submodule(&repo, &url, Path::new("src")); git::commit(&repo); @@ -1000,7 +1000,7 @@ fn dep_with_bad_submodule() { let git_project2 = git::new("dep2", |project| project.file("lib.rs", "pub fn dep() {}")); let repo = git2::Repository::open(&git_project.root()).unwrap(); - let url = path2url(git_project2.root()).to_string(); + let url = git_project2.root().to_url().to_string(); git::add_submodule(&repo, &url, Path::new("src")); git::commit(&repo); @@ -2441,12 +2441,12 @@ fn dont_require_submodules_are_checked_out() { let git2 = git::new("dep2", |p| p); let repo = git2::Repository::open(&git1.root()).unwrap(); - let url = path2url(git2.root()).to_string(); + let url = git2.root().to_url().to_string(); git::add_submodule(&repo, &url, Path::new("a/submodule")); git::commit(&repo); git2::Repository::init(&p.root()).unwrap(); - let url = path2url(git1.root()).to_string(); + let url = git1.root().to_url().to_string(); let dst = paths::home().join("foo"); git2::Repository::clone(&url, &dst).unwrap(); @@ -2863,7 +2863,7 @@ fn failed_submodule_checkout() { drop((repo, url)); let repo = git2::Repository::open(&git_project.root()).unwrap(); - let url = path2url(git_project2.root()).to_string(); + let url = git_project2.root().to_url().to_string(); git::add_submodule(&repo, &url, Path::new("src")); git::commit(&repo); drop(repo); @@ -3152,7 +3152,7 @@ fn dirty_submodule() { project.no_manifest().file("lib.rs", "pub fn f() {}") }); - let url = path2url(git_project2.root()).to_string(); + let url = git_project2.root().to_url().to_string(); git::add_submodule(&repo, &url, Path::new("src")); // Submodule added, but not committed. @@ -3200,7 +3200,7 @@ to proceed despite this and include the uncommitted changes, pass the `--allow-d // Try with a nested submodule. let git_project3 = git::new("bar", |project| project.no_manifest().file("mod.rs", "")); - let url = path2url(git_project3.root()).to_string(); + let url = git_project3.root().to_url().to_string(); git::add_submodule(&sub_repo, &url, Path::new("bar")); git_project .cargo("package --no-verify") @@ -4085,7 +4085,7 @@ fn git_worktree_with_bare_original_repo() { .bare(true) .clone_local(git2::build::CloneLocal::Local) .clone( - path2url(git_project.root()).as_str(), + git_project.root().to_url().as_str(), &paths::root().join("foo-bare"), ) .unwrap() diff --git a/tests/testsuite/global_cache_tracker.rs b/tests/testsuite/global_cache_tracker.rs index 11f0b5ceef4..449cdc6e368 100644 --- a/tests/testsuite/global_cache_tracker.rs +++ b/tests/testsuite/global_cache_tracker.rs @@ -18,7 +18,7 @@ use cargo::core::global_cache_tracker::{self, DeferredGlobalLastUse, GlobalCache use cargo::util::cache_lock::CacheLockMode; use cargo::util::interning::InternedString; use cargo::GlobalContext; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::{Package, RegistryBuilder}; use cargo_test_support::{ diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index 09ce2ec474f..9551261db4d 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -21,7 +21,7 @@ use cargo_util::{ProcessBuilder, ProcessError}; use cargo_test_support::install::{ assert_has_installed_exe, assert_has_not_installed_exe, cargo_home, exe, }; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; fn pkg(name: &str, vers: &str) { Package::new(name, vers) diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index d3b74cd196c..616538a6521 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -8,7 +8,6 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use cargo::core::PackageId; use cargo_test_support::install::{cargo_home, exe}; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{ diff --git a/tests/testsuite/local_registry.rs b/tests/testsuite/local_registry.rs index 42e2f18d410..7f2079b48dc 100644 --- a/tests/testsuite/local_registry.rs +++ b/tests/testsuite/local_registry.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::{registry_path, Package}; use cargo_test_support::{basic_manifest, project, str, t}; diff --git a/tests/testsuite/login.rs b/tests/testsuite/login.rs index fed64728435..9d5f3a2f811 100644 --- a/tests/testsuite/login.rs +++ b/tests/testsuite/login.rs @@ -4,7 +4,7 @@ use std::fs; use std::path::PathBuf; use cargo_test_support::cargo_process; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, RegistryBuilder}; use cargo_test_support::str; diff --git a/tests/testsuite/logout.rs b/tests/testsuite/logout.rs index 0ff27076bd5..aa2ac38fc78 100644 --- a/tests/testsuite/logout.rs +++ b/tests/testsuite/logout.rs @@ -1,7 +1,7 @@ //! Tests for the `cargo logout` command. use super::login::check_token; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::TestRegistry; use cargo_test_support::{cargo_process, registry, str}; diff --git a/tests/testsuite/old_cargos.rs b/tests/testsuite/old_cargos.rs index e177b2bf0a2..cb12876abc5 100644 --- a/tests/testsuite/old_cargos.rs +++ b/tests/testsuite/old_cargos.rs @@ -15,7 +15,6 @@ use std::fs; use cargo::CargoResult; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Dependency, Package}; use cargo_test_support::{cargo_exe, execs, paths, process, project, rustc_host}; diff --git a/tests/testsuite/owner.rs b/tests/testsuite/owner.rs index 7f7dd8f4b74..ec473183f34 100644 --- a/tests/testsuite/owner.rs +++ b/tests/testsuite/owner.rs @@ -2,7 +2,6 @@ use std::fs; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{self, api_path}; diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 773cdf75872..3ed3c0e2ed9 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -3,13 +3,12 @@ use std::fs::{self, read_to_string, File}; use std::path::Path; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::publish::validate_crate_contents; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{ - basic_manifest, cargo_process, git, path2url, paths, project, rustc_host, str, - symlink_supported, t, ProjectBuilder, + basic_manifest, cargo_process, git, paths, project, rustc_host, str, symlink_supported, t, + ProjectBuilder, }; use flate2::read::GzDecoder; use tar::Archive; @@ -608,7 +607,7 @@ fn package_git_submodule() { }); let repository = git2::Repository::open(&project.root()).unwrap(); - let url = path2url(library.root()).to_string(); + let url = library.root().to_url().to_string(); git::add_submodule(&repository, &url, Path::new("bar")); git::commit(&repository); @@ -656,7 +655,7 @@ fn package_symlink_to_submodule() { }); let repository = git2::Repository::open(&project.root()).unwrap(); - let url = path2url(library.root()).to_string(); + let url = library.root().to_url().to_string(); git::add_submodule(&repository, &url, Path::new("submodule")); t!(symlink( &project.root().join("submodule"), diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs index ff5156d618c..17179a520cc 100644 --- a/tests/testsuite/path.rs +++ b/tests/testsuite/path.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index 3adf1ab03bf..003220bcfca 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -1,6 +1,5 @@ //! Tests for profiles defined in config files. -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_lib_manifest, paths, project, str}; diff --git a/tests/testsuite/profile_custom.rs b/tests/testsuite/profile_custom.rs index 50be88f08b4..0dfed1d18e2 100644 --- a/tests/testsuite/profile_custom.rs +++ b/tests/testsuite/profile_custom.rs @@ -1,6 +1,5 @@ //! Tests for named profiles. -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::{basic_lib_manifest, project, str}; diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index dbdd84b1e20..b17f71d046d 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -8,7 +8,7 @@ use std::sync::Mutex; use cargo::core::SourceId; use cargo_test_support::cargo_process; -use cargo_test_support::paths::{self, CargoPathExt}; +use cargo_test_support::paths; use cargo_test_support::prelude::*; use cargo_test_support::registry::{ self, registry_path, Dependency, Package, RegistryBuilder, Response, TestRegistry, diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index 2a193ed0536..6e7398ec53e 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -4,7 +4,6 @@ use cargo_test_support::install::{ assert_has_installed_exe, assert_has_not_installed_exe, cargo_home, }; use cargo_test_support::is_nightly; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 931e9040c6e..d251edb19fb 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -1603,7 +1603,7 @@ fn print_env_verbose() { #[cargo_test] #[cfg(target_os = "macos")] fn run_link_system_path_macos() { - use cargo_test_support::paths::{self, CargoPathExt}; + use cargo_test_support::paths; use std::fs; // Check that the default system library path is honored. // First, build a shared library that will be accessed from diff --git a/tests/testsuite/rustc_info_cache.rs b/tests/testsuite/rustc_info_cache.rs index 91cb6a05afb..8a3ac5c30a1 100644 --- a/tests/testsuite/rustc_info_cache.rs +++ b/tests/testsuite/rustc_info_cache.rs @@ -2,8 +2,8 @@ use std::env; +use cargo_test_support::basic_bin_manifest; use cargo_test_support::prelude::*; -use cargo_test_support::{basic_bin_manifest, paths::CargoPathExt}; use cargo_test_support::{basic_manifest, project}; const MISS: &str = "[..] rustc info cache miss[..]"; diff --git a/tests/testsuite/rustup.rs b/tests/testsuite/rustup.rs index 7e0670a4b8d..c9fda456691 100644 --- a/tests/testsuite/rustup.rs +++ b/tests/testsuite/rustup.rs @@ -6,7 +6,7 @@ use std::ffi::OsString; use std::fs; use std::path::{Path, PathBuf}; -use cargo_test_support::paths::{home, root, CargoPathExt}; +use cargo_test_support::paths::{home, root}; use cargo_test_support::prelude::*; use cargo_test_support::{cargo_process, process, project, str}; diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index 0ed64e9e7e2..1c6ceabd878 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -2,7 +2,6 @@ use std::fs; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ diff --git a/tests/testsuite/weak_dep_features.rs b/tests/testsuite/weak_dep_features.rs index 715b7b6b2fd..00824eacf3d 100644 --- a/tests/testsuite/weak_dep_features.rs +++ b/tests/testsuite/weak_dep_features.rs @@ -2,7 +2,6 @@ use std::fmt::Write; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package, RegistryBuilder}; use cargo_test_support::str; diff --git a/tests/testsuite/yank.rs b/tests/testsuite/yank.rs index 4d068c84aa4..04967a7a347 100644 --- a/tests/testsuite/yank.rs +++ b/tests/testsuite/yank.rs @@ -2,7 +2,6 @@ use std::fs; -use cargo_test_support::paths::CargoPathExt; use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry;