Update Wasmtime to the 2024 Rust Edition (#10806)

* Update Wasmtime to the 2024 Rust Edition

Now that our MSRV supports the 2024 edition it's possible to make this
switch. This commit moves Wasmtime to the 2024 Edition to keep
up-to-date with Rust idioms and access many of the edition features
exclusive to the 2024 edition.

prtest:full

* Reformat with the 2024 edition

Author: alexcrichton

Cargo.toml

@@ -171,7 +171,7 @@ exclude = [
 [workspace.package]
 version = "34.0.0"
 authors = ["The Wasmtime Project Developers"]
-edition = "2021"
+edition = "2024"
 # Wasmtime's current policy is that this number can be no larger than the
 # current stable release of Rust minus 2.
 rust-version = "1.85.0"
@@ -185,19 +185,6 @@ unused_import_braces = 'warn'
 unused-lifetimes = 'warn'
 unused-macro-rules = 'warn'
 
-# Lints that are part of the `rust-2024-compatibility` group. This group is a
-# bit too noisy to enable wholesale but some selective items are ones we want to
-# opt-in to.
-keyword_idents_2024 = 'warn'
-unsafe-attr-outside-unsafe = 'warn'
-deprecated-safe-2024 = 'warn'
-rust-2024-guarded-string-incompatible-syntax = 'warn'
-rust-2024-prelude-collisions = 'warn'
-rust-2024-incompatible-pat = 'warn'
-missing-unsafe-on-extern = 'warn'
-impl-trait-overcaptures = 'warn'
-unsafe-op-in-unsafe-fn = 'warn'
-
 # Don't warn about unknown cfgs for pulley
 [workspace.lints.rust.unexpected_cfgs]
 level = "warn"

benches/call.rs

@@ -1,5 +1,5 @@
 use criterion::measurement::WallTime;
-use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
+use criterion::{BenchmarkGroup, Criterion, criterion_group, criterion_main};
 use std::fmt::Debug;
 use std::future::Future;
 use std::pin::Pin;

benches/instantiation.rs

@@ -1,12 +1,12 @@
 use anyhow::Result;
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use std::cell::LazyCell;
 use std::path::Path;
 use std::process::Command;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
 use std::thread;
-use wasi_common::{sync::WasiCtxBuilder, WasiCtx};
+use wasi_common::{WasiCtx, sync::WasiCtxBuilder};
 use wasmtime::*;
 
 fn store(engine: &Engine) -> Store<WasiCtx> {

benches/thread_eager_init.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::thread;
 use std::time::{Duration, Instant};
 use wasmtime::*;

benches/wasi.rs

@@ -1,8 +1,8 @@
 //! Measure some common WASI call scenarios.
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::{fs::File, path::Path, time::Instant};
-use wasi_common::{sync::WasiCtxBuilder, WasiCtx};
+use wasi_common::{WasiCtx, sync::WasiCtxBuilder};
 use wasmtime::{Engine, Linker, Module, Store, TypedFunc};
 
 criterion_group!(benches, bench_wasi);

cranelift/assembler-x64/fuzz/fuzz_targets/roundtrip.rs

@@ -1,6 +1,6 @@
 #![no_main]
 
-use cranelift_assembler_x64::{fuzz, Inst};
+use cranelift_assembler_x64::{Inst, fuzz};
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|inst: Inst<fuzz::FuzzRegs>| {

cranelift/assembler-x64/meta/src/dsl.rs

@@ -8,13 +8,13 @@ mod encoding;
 mod features;
 pub mod format;
 
-pub use encoding::{rex, vex};
 pub use encoding::{
     Encoding, Group1Prefix, Group2Prefix, Group3Prefix, Group4Prefix, Opcodes, Prefixes, Rex,
 };
-pub use features::{Feature, Features, ALL_FEATURES};
-pub use format::{align, fmt, r, rw, sxl, sxq, sxw, w};
+pub use encoding::{rex, vex};
+pub use features::{ALL_FEATURES, Feature, Features};
 pub use format::{Extension, Format, Location, Mutability, Operand, OperandKind};
+pub use format::{align, fmt, r, rw, sxl, sxq, sxw, w};
 
 /// Abbreviated constructor for an x64 instruction.
 pub fn inst(

cranelift/assembler-x64/meta/src/generate.rs

@@ -6,7 +6,7 @@ mod inst;
 mod operand;
 
 use crate::dsl;
-use cranelift_srcgen::{fmtln, Formatter};
+use cranelift_srcgen::{Formatter, fmtln};
 
 /// Generate the Rust assembler code; e.g., `enum Inst { ... }`.
 pub fn rust_assembler(f: &mut Formatter, insts: &[dsl::Inst]) {
@@ -57,7 +57,10 @@ fn generate_derive(f: &mut Formatter) {
 /// Adds a custom bound to the `Arbitrary` implementation which ensures that
 /// the associated registers are all `Arbitrary` as well.
 fn generate_derive_arbitrary_bounds(f: &mut Formatter) {
-    fmtln!(f, "#[cfg_attr(any(test, feature = \"fuzz\"), arbitrary(bound = \"R: crate::fuzz::RegistersArbitrary\"))]");
+    fmtln!(
+        f,
+        "#[cfg_attr(any(test, feature = \"fuzz\"), arbitrary(bound = \"R: crate::fuzz::RegistersArbitrary\"))]"
+    );
 }
 
 /// `impl std::fmt::Display for Inst { ... }`

cranelift/assembler-x64/meta/src/generate/features.rs

@@ -1,6 +1,6 @@
 //! Generate feature-related Rust code.
 
-use super::{fmtln, Formatter};
+use super::{Formatter, fmtln};
 use crate::{dsl, generate::generate_derive};
 
 impl dsl::Feature {

cranelift/assembler-x64/meta/src/generate/format.rs

@@ -1,7 +1,7 @@
 //! Generate format-related Rust code; this also includes generation of encoding
 //! Rust code.
 
-use super::{fmtln, Formatter};
+use super::{Formatter, fmtln};
 use crate::dsl;
 
 impl dsl::Format {