Auto-apply new import style in uncontroversial cases

Current settings:
  group_imports = "StdExternalCrate"
  imports_granularity = "Module"

Author: Bromeon

godot-bindings/src/godot_exe.rs

@@ -7,15 +7,17 @@
 
 //! Commands related to Godot executable
 
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Output};
+
+use regex::Regex;
+
 use crate::godot_version::{parse_godot_version, validate_godot_version};
 use crate::header_gen::generate_rust_binding;
 use crate::watch::StopWatch;
 use crate::GodotVersion;
 
-use regex::Regex;
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::process::{Command, Output};
 // Note: CARGO_BUILD_TARGET_DIR and CARGO_TARGET_DIR are not set.
 // OUT_DIR would be standing to reason, but it's an unspecified path that cannot be referenced by CI.
 // const GODOT_VERSION_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/src/gen/godot_version.txt");

godot-bindings/src/godot_version.rs

@@ -9,11 +9,13 @@
 // while all the functions included are used only with `custom-api` and `custom-api-json` features.
 #![cfg_attr(not(feature = "api-custom"), allow(unused_variables, dead_code))]
 
-use crate::GodotVersion;
-use regex::{Captures, Regex};
 use std::error::Error;
 use std::str::FromStr;
 
+use regex::{Captures, Regex};
+
+use crate::GodotVersion;
+
 pub fn parse_godot_version(version_str: &str) -> Result<GodotVersion, Box<dyn Error>> {
     // Format of the string emitted by `godot --version`:
     // https://github.com/godot-rust/gdext/issues/118#issuecomment-1465748123

godot-bindings/src/lib.rs

@@ -48,9 +48,10 @@ mod godot_version;
 #[cfg(feature = "api-custom")]
 #[path = ""]
 mod depend_on_custom {
-    use super::*;
     use std::borrow::Cow;
 
+    use super::*;
+
     pub(crate) mod godot_exe;
     pub(crate) mod godot_version;
     pub(crate) mod header_gen;
@@ -82,10 +83,10 @@ pub use depend_on_custom::*;
 #[cfg(feature = "api-custom-json")]
 #[path = ""]
 mod depend_on_custom_json {
-    use super::*;
-
     use std::borrow::Cow;
 
+    use super::*;
+
     pub(crate) mod godot_json;
     pub(crate) mod godot_version;
     pub(crate) mod header_gen;

godot-bindings/src/watch.rs

@@ -6,12 +6,10 @@
  */
 
 use std::fs::File;
-use std::io::BufWriter;
+use std::io::{BufWriter, Write};
 use std::path::Path;
 use std::time::{Duration, Instant};
 
-use std::io::Write;
-
 pub struct StopWatch {
     last_instant: Instant,
     metrics: Vec<Metric>,

godot-cell/src/borrow_state.rs

@@ -300,8 +300,11 @@ impl From<String> for BorrowStateErr {
 
 #[cfg(all(test, feature = "proptest"))]
 mod proptests {
+    use proptest::arbitrary::Arbitrary;
+    use proptest::collection::vec;
+    use proptest::prelude::*;
+
     use super::*;
-    use proptest::{arbitrary::Arbitrary, collection::vec, prelude::*};
 
     impl BorrowState {
         fn has_shared_reference(&self) -> bool {

godot-cell/tests/mock/blocking.rs

@@ -12,7 +12,8 @@
 use std::collections::HashMap;
 use std::error::Error;
 use std::marker::PhantomData;
-use std::sync::{atomic::AtomicUsize, Mutex, OnceLock};
+use std::sync::atomic::AtomicUsize;
+use std::sync::{Mutex, OnceLock};
 use std::time::Duration;
 
 use godot_cell::blocking::{GdCell, InaccessibleGuard};

godot-cell/tests/mock/panicking.rs

@@ -12,7 +12,8 @@
 use std::collections::HashMap;
 use std::error::Error;
 use std::marker::PhantomData;
-use std::sync::{atomic::AtomicUsize, Mutex, OnceLock};
+use std::sync::atomic::AtomicUsize;
+use std::sync::{Mutex, OnceLock};
 
 use godot_cell::panicking::{GdCell, InaccessibleGuard};
 

godot-codegen/src/context.rs

@@ -5,6 +5,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+use std::collections::{HashMap, HashSet};
+
+use proc_macro2::{Ident, TokenStream};
+use quote::{format_ident, ToTokens};
+
 use crate::generator::method_tables::MethodTableKey;
 use crate::generator::notifications;
 use crate::models::domain::{ArgPassing, GodotTy, RustTy, TyName};
@@ -13,9 +18,6 @@ use crate::models::json::{
 };
 use crate::util::option_as_slice;
 use crate::{special_cases, util, JsonExtensionApi};
-use proc_macro2::{Ident, TokenStream};
-use quote::{format_ident, ToTokens};
-use std::collections::{HashMap, HashSet};
 
 #[derive(Default)]
 pub struct Context<'a> {

godot-codegen/src/conv/name_conversions.rs

@@ -7,9 +7,10 @@
 
 //! Identifier renamings (Godot -> Rust)
 
-use crate::util::ident;
 use proc_macro2::Ident;
 
+use crate::util::ident;
+
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Case conversions
 

godot-codegen/src/conv/type_conversions.rs

@@ -7,9 +7,10 @@
 
 //! Type and expression conversions (Godot -> Rust)
 
+use std::fmt;
+
 use proc_macro2::{Ident, Literal, TokenStream};
 use quote::{quote, ToTokens};
-use std::fmt;
 
 use crate::context::Context;
 use crate::conv;