refactor: Migrate to Edition 2024

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 = [

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::*;

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;

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") {

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
 ///

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};

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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;

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]

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;

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;

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;

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]

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]

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]

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]

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]

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]

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]