diff options
| -rw-r--r-- | .rustfmt.toml | 4 | ||||
| -rw-r--r-- | src/intrinsic/mod.rs | 4 | ||||
| -rw-r--r-- | tests/lang_tests_common.rs | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.rustfmt.toml b/.rustfmt.toml index 725aec25a07..a11bc41680d 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,3 +1,5 @@ -version = "Two" +style_edition = "2024" use_small_heuristics = "Max" merge_derives = false +group_imports = "StdExternalCrate" +imports_granularity = "Module" diff --git a/src/intrinsic/mod.rs b/src/intrinsic/mod.rs index 11f9604c6d2..42d189d1b7d 100644 --- a/src/intrinsic/mod.rs +++ b/src/intrinsic/mod.rs @@ -13,11 +13,11 @@ use rustc_codegen_ssa::common::IntPredicate; use rustc_codegen_ssa::errors::InvalidMonomorphization; use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue}; use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue}; -use rustc_codegen_ssa::traits::BaseTypeCodegenMethods; #[cfg(feature = "master")] use rustc_codegen_ssa::traits::MiscCodegenMethods; use rustc_codegen_ssa::traits::{ - ArgAbiBuilderMethods, BuilderMethods, ConstCodegenMethods, IntrinsicCallBuilderMethods, + ArgAbiBuilderMethods, BaseTypeCodegenMethods, BuilderMethods, ConstCodegenMethods, + IntrinsicCallBuilderMethods, }; use rustc_middle::bug; #[cfg(feature = "master")] diff --git a/tests/lang_tests_common.rs b/tests/lang_tests_common.rs index fafb7be55ce..64c932a2658 100644 --- a/tests/lang_tests_common.rs +++ b/tests/lang_tests_common.rs @@ -1,10 +1,8 @@ //! The common code for `tests/lang_tests_*.rs` -use std::{ - env::{self, current_dir}, - path::{Path, PathBuf}, - process::Command, -}; +use std::env::{self, current_dir}; +use std::path::{Path, PathBuf}; +use std::process::Command; use boml::Toml; use lang_tester::LangTester; |