Update to Rust 2024 (#15732)

This updates all crates to Rust 2024.

Author: weihanglo

.git-blame-ignore-revs

@@ -154,3 +154,5 @@ fecb72464328846dacd0ff8252d105b7818733ab
 a6ad2de0484f1910d42793f3ec73b111403099b7
 # cargo fmt
 b0fbc89c33780ca3e1f2bfeacc67922ee7abe1dc
+# Rustfmt 2024
+1ce80236261a3cd42a95b1f1abcffede87cafef4

Cargo.lock

@@ -12,7 +12,7 @@ exclude = [
 
 [workspace.package]
 rust-version = "1.86"  # MSRV:3
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"

Cargo.toml

@@ -1,10 +1,10 @@
 //! Benchmarks for the global cache tracker.
 
 use cargo::core::global_cache_tracker::{self, DeferredGlobalLastUse, GlobalCacheTracker};
+use cargo::util::GlobalContext;
 use cargo::util::cache_lock::CacheLockMode;
 use cargo::util::interning::InternedString;
-use cargo::util::GlobalContext;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::fs;
 use std::path::{Path, PathBuf};
 

benches/benchsuite/benches/global_cache_tracker.rs

@@ -1,11 +1,11 @@
 use benchsuite::fixtures;
+use cargo::GlobalContext;
 use cargo::core::compiler::{CompileKind, RustcTargetData};
 use cargo::core::resolver::features::{FeatureOpts, FeatureResolver};
 use cargo::core::resolver::{CliFeatures, ForceAllTargets, HasDevUnits, ResolveBehavior};
 use cargo::core::{PackageIdSpec, Workspace};
 use cargo::ops::WorkspaceResolve;
-use cargo::GlobalContext;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::path::Path;
 
 struct ResolveInfo<'gctx> {

benches/benchsuite/benches/resolve.rs

@@ -1,6 +1,6 @@
 use benchsuite::fixtures;
 use cargo::core::Workspace;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 
 fn workspace_initialization(c: &mut Criterion) {
     let fixtures = fixtures!();

benches/benchsuite/benches/workspace_initialization.rs

@@ -12,9 +12,9 @@
 //! The database is kept in git. It usually shouldn't need to be re-generated
 //! unless there is a change in the schema or the benchmark.
 
+use cargo::GlobalContext;
 use cargo::core::global_cache_tracker::{self, DeferredGlobalLastUse, GlobalCacheTracker};
 use cargo::util::cache_lock::CacheLockMode;
-use cargo::GlobalContext;
 use rand::prelude::*;
 use std::collections::HashMap;
 use std::fs;

benches/benchsuite/src/bin/capture-last-use.rs

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-platform"
-version = "0.3.0"
+version = "0.3.1"
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true

crates/cargo-platform/Cargo.toml

@@ -261,11 +261,11 @@ impl<'a> Parser<'a> {
                                     expected: "a string",
                                     found: t.classify(),
                                 },
-                            ))
+                            ));
                         }
                         Some(Err(e)) => return Err(e),
                         None => {
-                            return Err(ParseError::new(self.t.orig, IncompleteExpr("a string")))
+                            return Err(ParseError::new(self.t.orig, IncompleteExpr("a string")));
                         }
                     };
                     Cfg::KeyPair(

crates/cargo-platform/src/cfg.rs

@@ -44,7 +44,7 @@
 use crate::cross_compile::try_alternate;
 use crate::paths;
 use crate::rustc_host;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use snapbox::Data;
 use snapbox::IntoData;
 use std::fmt;