diff --git a/Cargo.toml b/Cargo.toml index 3d94907bd1..6655cb120f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ name = "cargo-edit" readme = "README.md" repository = "https://github.com/killercup/cargo-edit" version = "0.13.1" -edition = "2021" +edition = "2024" [package.metadata.release] pre-release-replacements = [ diff --git a/src/bin/set-version/set_version.rs b/src/bin/set-version/set_version.rs index 3c55e16401..afdd92bf2c 100644 --- a/src/bin/set-version/set_version.rs +++ b/src/bin/set-version/set_version.rs @@ -1,7 +1,7 @@ use std::path::Path; use std::path::PathBuf; -use cargo_edit::{shell_status, shell_warn, upgrade_requirement, LocalManifest}; +use cargo_edit::{LocalManifest, shell_status, shell_warn, upgrade_requirement}; use clap::Args; use crate::errors::*; diff --git a/src/bin/upgrade/upgrade.rs b/src/bin/upgrade/upgrade.rs index 86b15b48fd..f85817cc0f 100644 --- a/src/bin/upgrade/upgrade.rs +++ b/src/bin/upgrade/upgrade.rs @@ -5,9 +5,9 @@ use std::path::PathBuf; use anyhow::Context as _; use cargo_edit::{ - get_compatible_dependency, get_latest_dependency, registry_url, set_dep_version, shell_note, - shell_status, shell_warn, shell_write_stdout, CargoResult, CertsSource, CrateSpec, Dependency, - IndexCache, LocalManifest, RustVersion, Source, + CargoResult, CertsSource, CrateSpec, Dependency, IndexCache, LocalManifest, RustVersion, + Source, get_compatible_dependency, get_latest_dependency, registry_url, set_dep_version, + shell_note, shell_status, shell_warn, shell_write_stdout, }; use clap::Args; use indexmap::IndexMap; diff --git a/src/dependency.rs b/src/dependency.rs index 263c6ab48c..3f8c9ff9b0 100644 --- a/src/dependency.rs +++ b/src/dependency.rs @@ -239,7 +239,9 @@ impl Dependency { let default_features = table.get("default-features").and_then(|v| v.as_bool()); if table.contains_key("default_features") { - anyhow::bail!("Use of `default_features` in `{key}` is unsupported, please switch to `default-features`"); + anyhow::bail!( + "Use of `default_features` in `{key}` is unsupported, please switch to `default-features`" + ); } let features = if let Some(value) = table.get("features") { diff --git a/src/fetch.rs b/src/fetch.rs index 69a52754bb..572b823621 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,8 +1,8 @@ -use super::errors::*; use super::AnyIndexCache; use super::Dependency; use super::RegistrySource; use super::VersionExt; +use super::errors::*; /// Query latest version from a registry index /// diff --git a/src/lib.rs b/src/lib.rs index 582a1bd24c..3025c675bf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,13 +38,13 @@ pub use dependency::PathSource; pub use dependency::RegistrySource; pub use dependency::Source; pub use errors::*; -pub use fetch::{get_compatible_dependency, get_latest_dependency, RustVersion}; +pub use fetch::{RustVersion, get_compatible_dependency, get_latest_dependency}; pub use index::*; -pub use manifest::{find, get_dep_version, set_dep_version, LocalManifest, Manifest}; +pub use manifest::{LocalManifest, Manifest, find, get_dep_version, set_dep_version}; pub use metadata::manifest_from_pkgid; pub use registry::registry_url; pub use util::{ - colorize_stderr, shell_note, shell_print, shell_status, shell_warn, shell_write_stderr, - shell_write_stdout, Color, ColorChoice, + Color, ColorChoice, colorize_stderr, shell_note, shell_print, shell_status, shell_warn, + shell_write_stderr, shell_write_stdout, }; -pub use version::{upgrade_requirement, VersionExt}; +pub use version::{VersionExt, upgrade_requirement}; diff --git a/tests/cargo-set-version/downgrade_error/mod.rs b/tests/cargo-set-version/downgrade_error/mod.rs index a71fc90b78..2d54a0c093 100644 --- a/tests/cargo-set-version/downgrade_error/mod.rs +++ b/tests/cargo-set-version/downgrade_error/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/dry_run/mod.rs b/tests/cargo-set-version/dry_run/mod.rs index dd024bac26..30d5a090a8 100644 --- a/tests/cargo-set-version/dry_run/mod.rs +++ b/tests/cargo-set-version/dry_run/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/ignore_dependent/mod.rs b/tests/cargo-set-version/ignore_dependent/mod.rs index e2797416d2..dc53e5d8bf 100644 --- a/tests/cargo-set-version/ignore_dependent/mod.rs +++ b/tests/cargo-set-version/ignore_dependent/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/relative_absolute_conflict/mod.rs b/tests/cargo-set-version/relative_absolute_conflict/mod.rs index 0b578c2d2e..41ff27d291 100644 --- a/tests/cargo-set-version/relative_absolute_conflict/mod.rs +++ b/tests/cargo-set-version/relative_absolute_conflict/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/set_absolute_version/mod.rs b/tests/cargo-set-version/set_absolute_version/mod.rs index 6e64c25cc9..27726a3ace 100644 --- a/tests/cargo-set-version/set_absolute_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_version/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs index cde3747daa..87bdf7600e 100644 --- a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/set_relative_version/mod.rs b/tests/cargo-set-version/set_relative_version/mod.rs index 0d3fc42049..0026951e16 100644 --- a/tests/cargo-set-version/set_relative_version/mod.rs +++ b/tests/cargo-set-version/set_relative_version/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/set_relative_workspace_version/mod.rs b/tests/cargo-set-version/set_relative_workspace_version/mod.rs index c10d36da01..e8dfcbbf02 100644 --- a/tests/cargo-set-version/set_relative_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_relative_workspace_version/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs index b0b9bd28b1..cd961c72a5 100644 --- a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs index 7f069b160a..004e0a3b0b 100644 --- a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/upgrade_workspace/mod.rs b/tests/cargo-set-version/upgrade_workspace/mod.rs index 44ac893875..875c003524 100644 --- a/tests/cargo-set-version/upgrade_workspace/mod.rs +++ b/tests/cargo-set-version/upgrade_workspace/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/virtual_workspace_deps/mod.rs b/tests/cargo-set-version/virtual_workspace_deps/mod.rs index 44ac893875..875c003524 100644 --- a/tests/cargo-set-version/virtual_workspace_deps/mod.rs +++ b/tests/cargo-set-version/virtual_workspace_deps/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/workspace_deps/mod.rs b/tests/cargo-set-version/workspace_deps/mod.rs index 44ac893875..875c003524 100644 --- a/tests/cargo-set-version/workspace_deps/mod.rs +++ b/tests/cargo-set-version/workspace_deps/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/workspace_version_exclude/mod.rs b/tests/cargo-set-version/workspace_version_exclude/mod.rs index 308b2252b3..97e305f52d 100644 --- a/tests/cargo-set-version/workspace_version_exclude/mod.rs +++ b/tests/cargo-set-version/workspace_version_exclude/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-set-version/workspace_version_subset/mod.rs b/tests/cargo-set-version/workspace_version_subset/mod.rs index e6b7d714e6..0101af17d3 100644 --- a/tests/cargo-set-version/workspace_version_subset/mod.rs +++ b/tests/cargo-set-version/workspace_version_subset/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/alt_registry/mod.rs b/tests/cargo-upgrade/alt_registry/mod.rs index af7f62ad58..936367ffa8 100644 --- a/tests/cargo-upgrade/alt_registry/mod.rs +++ b/tests/cargo-upgrade/alt_registry/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_alt_registry; use crate::CargoCommand; +use crate::init_alt_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/cli_rust_version/mod.rs b/tests/cargo-upgrade/cli_rust_version/mod.rs index ae9871afd3..41703e8bfa 100644 --- a/tests/cargo-upgrade/cli_rust_version/mod.rs +++ b/tests/cargo-upgrade/cli_rust_version/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/dry_run/mod.rs b/tests/cargo-upgrade/dry_run/mod.rs index b2b1b6a11c..fbbb6d211d 100644 --- a/tests/cargo-upgrade/dry_run/mod.rs +++ b/tests/cargo-upgrade/dry_run/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/exclude_dep/mod.rs b/tests/cargo-upgrade/exclude_dep/mod.rs index 21b5f3a0bc..a8b763e5df 100644 --- a/tests/cargo-upgrade/exclude_dep/mod.rs +++ b/tests/cargo-upgrade/exclude_dep/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/exclude_renamed/mod.rs b/tests/cargo-upgrade/exclude_renamed/mod.rs index f895187ea8..ad2b2937e2 100644 --- a/tests/cargo-upgrade/exclude_renamed/mod.rs +++ b/tests/cargo-upgrade/exclude_renamed/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/ignore_rust_version/mod.rs b/tests/cargo-upgrade/ignore_rust_version/mod.rs index d293c9a7ac..e9b30d27f7 100644 --- a/tests/cargo-upgrade/ignore_rust_version/mod.rs +++ b/tests/cargo-upgrade/ignore_rust_version/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/implicit_prerelease/mod.rs b/tests/cargo-upgrade/implicit_prerelease/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/implicit_prerelease/mod.rs +++ b/tests/cargo-upgrade/implicit_prerelease/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/invalid_dep/mod.rs b/tests/cargo-upgrade/invalid_dep/mod.rs index e08f268a28..eb46e04740 100644 --- a/tests/cargo-upgrade/invalid_dep/mod.rs +++ b/tests/cargo-upgrade/invalid_dep/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/invalid_flag/mod.rs b/tests/cargo-upgrade/invalid_flag/mod.rs index be19844876..e980153007 100644 --- a/tests/cargo-upgrade/invalid_flag/mod.rs +++ b/tests/cargo-upgrade/invalid_flag/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/invalid_manifest/mod.rs b/tests/cargo-upgrade/invalid_manifest/mod.rs index b221a9ccf3..86d33a2c6a 100644 --- a/tests/cargo-upgrade/invalid_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_manifest/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs index b221a9ccf3..86d33a2c6a 100644 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/locked/mod.rs b/tests/cargo-upgrade/locked/mod.rs index 9a65f9a2e7..0fa6d6a026 100644 --- a/tests/cargo-upgrade/locked/mod.rs +++ b/tests/cargo-upgrade/locked/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/locked_dry_run/mod.rs b/tests/cargo-upgrade/locked_dry_run/mod.rs index d2c472b6c8..b460bdb5bb 100644 --- a/tests/cargo-upgrade/locked_dry_run/mod.rs +++ b/tests/cargo-upgrade/locked_dry_run/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/lockfile/mod.rs b/tests/cargo-upgrade/lockfile/mod.rs index b45a3ebcc6..73ab2863e3 100644 --- a/tests/cargo-upgrade/lockfile/mod.rs +++ b/tests/cargo-upgrade/lockfile/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/optional_dep/mod.rs b/tests/cargo-upgrade/optional_dep/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/optional_dep/mod.rs +++ b/tests/cargo-upgrade/optional_dep/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/package_rust_version/mod.rs b/tests/cargo-upgrade/package_rust_version/mod.rs index f44ebaa0a4..24992c1128 100644 --- a/tests/cargo-upgrade/package_rust_version/mod.rs +++ b/tests/cargo-upgrade/package_rust_version/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/pinned/mod.rs b/tests/cargo-upgrade/pinned/mod.rs index 9c50c9aa84..7a1f4cfddf 100644 --- a/tests/cargo-upgrade/pinned/mod.rs +++ b/tests/cargo-upgrade/pinned/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/preserve_op/mod.rs b/tests/cargo-upgrade/preserve_op/mod.rs index e5c519340c..c1c220afb5 100644 --- a/tests/cargo-upgrade/preserve_op/mod.rs +++ b/tests/cargo-upgrade/preserve_op/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/preserve_precision_major/mod.rs b/tests/cargo-upgrade/preserve_precision_major/mod.rs index 28d7791c13..edef7311fb 100644 --- a/tests/cargo-upgrade/preserve_precision_major/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_major/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/preserve_precision_minor/mod.rs b/tests/cargo-upgrade/preserve_precision_minor/mod.rs index 28d7791c13..edef7311fb 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_minor/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/preserve_precision_patch/mod.rs b/tests/cargo-upgrade/preserve_precision_patch/mod.rs index 28d7791c13..edef7311fb 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_patch/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/preserves_inline_table/mod.rs b/tests/cargo-upgrade/preserves_inline_table/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/preserves_inline_table/mod.rs +++ b/tests/cargo-upgrade/preserves_inline_table/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/preserves_std_table/mod.rs b/tests/cargo-upgrade/preserves_std_table/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/preserves_std_table/mod.rs +++ b/tests/cargo-upgrade/preserves_std_table/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/single_dep/mod.rs b/tests/cargo-upgrade/single_dep/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/single_dep/mod.rs +++ b/tests/cargo-upgrade/single_dep/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/skip_compatible/mod.rs b/tests/cargo-upgrade/skip_compatible/mod.rs index 70155b2e1c..39ee004836 100644 --- a/tests/cargo-upgrade/skip_compatible/mod.rs +++ b/tests/cargo-upgrade/skip_compatible/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/specified/mod.rs b/tests/cargo-upgrade/specified/mod.rs index 347d0f67e6..a9f35c7fe1 100644 --- a/tests/cargo-upgrade/specified/mod.rs +++ b/tests/cargo-upgrade/specified/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/to_version/mod.rs b/tests/cargo-upgrade/to_version/mod.rs index 8bcf5a10f0..05a2105eb2 100644 --- a/tests/cargo-upgrade/to_version/mod.rs +++ b/tests/cargo-upgrade/to_version/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/upgrade_all/mod.rs b/tests/cargo-upgrade/upgrade_all/mod.rs index b45a3ebcc6..73ab2863e3 100644 --- a/tests/cargo-upgrade/upgrade_all/mod.rs +++ b/tests/cargo-upgrade/upgrade_all/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/upgrade_everything/mod.rs b/tests/cargo-upgrade/upgrade_everything/mod.rs index 6647ab6d38..aa45953cf2 100644 --- a/tests/cargo-upgrade/upgrade_everything/mod.rs +++ b/tests/cargo-upgrade/upgrade_everything/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/upgrade_renamed/mod.rs b/tests/cargo-upgrade/upgrade_renamed/mod.rs index 0b3677c508..4a6a529abd 100644 --- a/tests/cargo-upgrade/upgrade_renamed/mod.rs +++ b/tests/cargo-upgrade/upgrade_renamed/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/upgrade_verbose/mod.rs b/tests/cargo-upgrade/upgrade_verbose/mod.rs index c4f09d994f..b362562a24 100644 --- a/tests/cargo-upgrade/upgrade_verbose/mod.rs +++ b/tests/cargo-upgrade/upgrade_verbose/mod.rs @@ -1,6 +1,6 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; use crate::CargoCommand; use cargo_test_support::current_dir; diff --git a/tests/cargo-upgrade/upgrade_workspace/mod.rs b/tests/cargo-upgrade/upgrade_workspace/mod.rs index 9bb2a22dd3..59c546818c 100644 --- a/tests/cargo-upgrade/upgrade_workspace/mod.rs +++ b/tests/cargo-upgrade/upgrade_workspace/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/virtual_manifest/mod.rs b/tests/cargo-upgrade/virtual_manifest/mod.rs index 7122af4889..dfe79c748d 100644 --- a/tests/cargo-upgrade/virtual_manifest/mod.rs +++ b/tests/cargo-upgrade/virtual_manifest/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/workspace_inheritance/mod.rs b/tests/cargo-upgrade/workspace_inheritance/mod.rs index d4593f7553..f5eff6c4b9 100644 --- a/tests/cargo-upgrade/workspace_inheritance/mod.rs +++ b/tests/cargo-upgrade/workspace_inheritance/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/workspace_member_cwd/mod.rs b/tests/cargo-upgrade/workspace_member_cwd/mod.rs index e8cbb1f9e6..026bab042b 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/mod.rs +++ b/tests/cargo-upgrade/workspace_member_cwd/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test] diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs index dc75cab38a..e3cb251f4c 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs +++ b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs @@ -1,9 +1,9 @@ +use cargo_test_support::Project; use cargo_test_support::compare::assert_ui; use cargo_test_support::file; -use cargo_test_support::Project; -use crate::init_registry; use crate::CargoCommand; +use crate::init_registry; use cargo_test_support::current_dir; #[cargo_test]