Merge pull request cargo-public-api#791 from cargo-public-api/edition-2024

Port more stuff to Edition 2024

Author: Enselic

cargo-public-api/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "cargo-public-api"
 version = "0.47.1"
 default-run = "cargo-public-api"

cargo-public-api/src/api_source.rs

@@ -1,12 +1,12 @@
 //! Contains various ways of obtaining the public API for crates.
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use rustdoc_json::BuildError;
 use std::path::{Path, PathBuf};
 
-use public_api::{PublicApi, MINIMUM_NIGHTLY_RUST_VERSION};
+use public_api::{MINIMUM_NIGHTLY_RUST_VERSION, PublicApi};
 
-use crate::{git_utils, Args, ArgsAndToolchain, Subcommand};
+use crate::{Args, ArgsAndToolchain, Subcommand, git_utils};
 
 /// Represents some place from which a public API can be obtained.
 /// Examples: a published crate, a git commit, an existing file.

cargo-public-api/src/error.rs

@@ -1,4 +1,4 @@
-use public_api::{diff::ChangedPublicItem, PublicItem};
+use public_api::{PublicItem, diff::ChangedPublicItem};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {

cargo-public-api/src/git_utils.rs

@@ -5,7 +5,7 @@ use std::{
     process::Command,
 };
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 
 /// Synchronously do a `git checkout` of `commit`.
 pub fn git_checkout(git_root: &Path, commit: &str, quiet: bool, force: bool) -> Result<()> {

cargo-public-api/src/main.rs

@@ -5,7 +5,7 @@ use std::ffi::OsString;
 use std::io::{stderr, stdout};
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use api_source::{ApiSource, Commit, CurrentDir, PublishedCrate, RustdocJson};
 use arg_types::{Color, DenyMethod, Omit};
 use git_utils::current_branch_or_commit;
@@ -572,7 +572,9 @@ fn subcommand_name(bin: OsString) -> Option<OsString> {
 fn resolve_toolchain(args: Args) -> ArgsAndToolchain {
     let toolchain = if toolchain::is_probably_stable() {
         if let Some(toolchain) = toolchain::from_rustup() {
-            eprintln!("Warning: using the `{toolchain}` toolchain for gathering the public api is not possible, switching to `nightly`");
+            eprintln!(
+                "Warning: using the `{toolchain}` toolchain for gathering the public api is not possible, switching to `nightly`"
+            );
         }
         Some("nightly".to_owned())
     } else {

cargo-public-api/src/plain.rs

@@ -1,7 +1,7 @@
 use std::io::{Result, Write};
 
 use nu_ansi_term::{AnsiString, AnsiStrings, Color, Style};
-use public_api::{diff::PublicApiDiff, tokens::Token, PublicItem};
+use public_api::{PublicItem, diff::PublicApiDiff, tokens::Token};
 
 use crate::Args;
 

cargo-public-api/src/published_crate.rs

@@ -3,7 +3,7 @@
 //! project.
 
 use crate::{Args, ArgsAndToolchain, LATEST_VERSION_ARG};
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use crates_index::{Crate, Version};
 use std::path::PathBuf;
 

cargo-public-api/tests/cargo-public-api-bin-tests.rs

@@ -15,8 +15,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use assert_cmd::assert::Assert;
 use assert_cmd::Command;
+use assert_cmd::assert::Assert;
 use chrono::{Days, NaiveDate};
 use predicates::prelude::PredicateBooleanExt;
 use predicates::str::contains;
@@ -1300,7 +1300,10 @@ impl TestRepo {
 impl Drop for TestRepo {
     fn drop(&mut self) {
         if env::var_os("CARGO_PUBLIC_API_PRESERVE_TEST_REPO").is_some() {
-            println!("DEBUG: NOT removing test repo at {:?}. If the test fails, you can `cd` into it and debug the failure", self.path());
+            println!(
+                "DEBUG: NOT removing test repo at {:?}. If the test fails, you can `cd` into it and debug the failure",
+                self.path()
+            );
         } else {
             remove_dir_all::remove_dir_all(self.path()).unwrap();
         }

public-api/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "public-api"
 version = "0.47.1"
 description = "List and diff the public API of Rust library crates. Relies on rustdoc JSON output from the nightly toolchain."

public-api/src/diff.rs

@@ -4,8 +4,8 @@
 //! additional helpers for that.
 
 use crate::{
-    public_item::{PublicItem, PublicItemPath},
     PublicApi,
+    public_item::{PublicItem, PublicItemPath},
 };
 use hashbag::HashBag;
 use std::collections::HashMap;