Reorder imports into a single block

build.rs

@@ -1,8 +1,8 @@
+use std::{fs::File, io::Write};
+
 #[path = "src/git.rs"]
 mod git;
 
-use std::{fs::File, io::Write};
-
 fn main() {
     let ver = git::repo_hash(".").unwrap_or_else(|_| "???".into());
 

src/analysis/bounds.rs

@@ -1,5 +1,3 @@
-use std::{collections::vec_deque::VecDeque, slice::Iter, vec::Vec};
-
 use crate::{
     analysis::{
         function_parameters::{async_param_to_remove, CParameter},
@@ -15,6 +13,7 @@ use crate::{
     },
     traits::IntoString,
 };
+use std::{collections::vec_deque::VecDeque, slice::Iter};
 
 #[derive(Clone, Eq, Debug, PartialEq)]
 pub enum BoundType {

src/analysis/c_type.rs

@@ -1,6 +1,5 @@
-use log::trace;
-
 use crate::{env::Env, library::TypeId};
+use log::trace;
 
 pub fn rustify_pointers(c_type: &str) -> (String, String) {
     let mut input = c_type.trim();

src/analysis/child_properties.rs

@@ -1,5 +1,3 @@
-use log::error;
-
 use crate::{
     analysis::{bounds::Bounds, imports::Imports, ref_mode::RefMode, rust_type::*},
     codegen::function,
@@ -8,6 +6,7 @@ use crate::{
     library, nameutil,
     traits::*,
 };
+use log::error;
 
 #[derive(Clone, Debug)]
 pub struct ChildProperty {

src/analysis/class_hierarchy.rs

@@ -1,7 +1,7 @@
 use crate::library::*;
 use std::{
     collections::{HashMap, HashSet},
-    iter::{self, Iterator},
+    iter,
 };
 
 #[derive(Debug)]

src/analysis/constants.rs

@@ -1,6 +1,5 @@
-use std::borrow::Borrow;
-
 use crate::{config, env::Env, library, nameutil, traits::*, version::Version};
+use std::borrow::Borrow;
 
 #[derive(Debug)]
 pub struct Info {

src/analysis/ffi_type.rs

@@ -1,5 +1,3 @@
-use log::{info, trace};
-
 use crate::{
     analysis::{
         c_type::{implements_c_type, rustify_pointers},
@@ -9,6 +7,7 @@ use crate::{
     library::*,
     traits::*,
 };
+use log::{info, trace};
 
 pub fn used_ffi_type(env: &Env, type_id: TypeId, c_type: &str) -> Option<String> {
     let (_ptr, inner) = rustify_pointers(c_type);

src/analysis/function_parameters.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use super::{
     conversion_type::ConversionType, out_parameters::can_as_return,
     override_string_type::override_string_type_parameter, ref_mode::RefMode, rust_type::rust_type,
@@ -11,6 +9,7 @@ use crate::{
     nameutil,
     traits::IntoString,
 };
+use std::collections::HashMap;
 
 //TODO: remove unused fields
 #[derive(Clone, Debug)]

src/analysis/functions.rs

@@ -5,13 +5,6 @@
  * method has a different prefix.
  */
 
-use log::warn;
-use std::{
-    borrow::Borrow,
-    collections::{HashMap, HashSet},
-    vec::Vec,
-};
-
 use crate::{
     analysis::{
         bounds::{Bounds, CallbackInfo},
@@ -32,6 +25,11 @@ use crate::{
     traits::*,
     version::Version,
 };
+use log::warn;
+use std::{
+    borrow::Borrow,
+    collections::{HashMap, HashSet},
+};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Visibility {

src/analysis/imports.rs

@@ -1,7 +1,6 @@
-use std::collections::btree_map::{BTreeMap, Iter};
-
 use super::namespaces;
 use crate::{library::Library, nameutil::crate_name, version::Version};
+use std::collections::btree_map::{BTreeMap, Iter};
 
 /// Provides assistance in generating use declarations.
 ///

src/analysis/mod.rs

@@ -1,10 +1,9 @@
-use log::error;
-use std::collections::BTreeMap;
-
 use crate::{
     env::Env,
     library::{self, Type, TypeId},
 };
+use log::error;
+use std::collections::BTreeMap;
 
 pub mod bounds;
 pub mod c_type;

src/analysis/namespaces.rs

@@ -1,6 +1,5 @@
-use std::ops::Index;
-
 use crate::{library, nameutil, version::Version};
+use std::ops::Index;
 
 pub type NsId = u16;
 pub const MAIN: NsId = library::MAIN_NAMESPACE;

src/analysis/object.rs

@@ -1,11 +1,10 @@
-use log::info;
-use std::ops::Deref;
-
 use super::{
     child_properties::ChildProperties, imports::Imports, info_base::InfoBase,
     signatures::Signatures, *,
 };
 use crate::{config::gobjects::GObject, env::Env, library, nameutil::*, traits::*};
+use log::info;
+use std::ops::Deref;
 
 #[derive(Debug, Default)]
 pub struct Info {

src/analysis/out_parameters.rs

@@ -1,5 +1,3 @@
-use std::{slice::Iter, vec::Vec};
-
 use crate::{
     analysis::{
         conversion_type::ConversionType, function_parameters::CParameter,
@@ -12,6 +10,7 @@ use crate::{
     nameutil,
     version::Version,
 };
+use std::slice::Iter;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Mode {

src/analysis/override_string_type.rs

@@ -1,6 +1,5 @@
-use log::error;
-
 use crate::{config, env::Env, library::*};
+use log::error;
 
 pub fn override_string_type_parameter(
     env: &Env,
@@ -27,7 +26,6 @@ pub fn override_string_type_return(
 }
 
 fn apply(env: &Env, type_id: TypeId, string_type: Option<config::StringType>) -> TypeId {
-    use crate::library::*;
     let string_type = if let Some(string_type) = string_type {
         string_type
     } else {
@@ -60,7 +58,6 @@ fn apply(env: &Env, type_id: TypeId, string_type: Option<config::StringType>) ->
 }
 
 fn can_overriden_fundamental(env: &Env, type_id: TypeId) -> bool {
-    use crate::library::*;
     match *env.library.type_(type_id) {
         Type::Fundamental(Fundamental::Filename) => true,
         Type::Fundamental(Fundamental::OsString) => true,

src/analysis/properties.rs

@@ -1,5 +1,3 @@
-use log::warn;
-
 use crate::{
     analysis::{
         imports::Imports,
@@ -15,6 +13,7 @@ use crate::{
     traits::*,
     version::Version,
 };
+use log::warn;
 
 #[derive(Debug)]
 pub struct Property {

src/analysis/record.rs

@@ -1,6 +1,3 @@
-use log::info;
-use std::ops::Deref;
-
 use super::{imports::Imports, info_base::InfoBase, record_type::RecordType, *};
 use crate::{
     config::{
@@ -12,6 +9,8 @@ use crate::{
     nameutil::*,
     traits::*,
 };
+use log::info;
+use std::ops::Deref;
 
 #[derive(Debug, Default)]
 pub struct Info {

src/analysis/return_value.rs

@@ -1,5 +1,3 @@
-use log::error;
-
 use crate::{
     analysis::{
         imports::Imports, namespaces, override_string_type::override_string_type_return,
@@ -9,6 +7,7 @@ use crate::{
     env::Env,
     library::{self, Nullable, TypeId},
 };
+use log::error;
 
 #[derive(Clone, Debug, Default)]
 pub struct Info {

src/analysis/rust_type.rs

@@ -1,12 +1,11 @@
-use std::result;
-
 use super::conversion_type::ConversionType;
 use crate::{
     analysis::ref_mode::RefMode,
     env::Env,
     library::{self, Nullable, ParameterScope},
     traits::*,
 };
+use std::result;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum TypeError {

src/analysis/signatures.rs

@@ -1,6 +1,5 @@
-use std::collections::HashMap;
-
 use crate::{env::Env, library, version::Version};
+use std::collections::HashMap;
 
 #[derive(Debug)]
 pub struct Signature(Vec<library::TypeId>, library::TypeId, Option<Version>);

src/analysis/special_functions.rs

@@ -1,9 +1,8 @@
-use std::{collections::BTreeMap, str::FromStr};
-
 use crate::analysis::{
     functions::{Info as FuncInfo, Visibility},
     imports::Imports,
 };
+use std::{collections::BTreeMap, str::FromStr};
 
 #[derive(Clone, Copy, Eq, Debug, Ord, PartialEq, PartialOrd)]
 pub enum Type {

src/analysis/supertypes.rs

@@ -1,5 +1,3 @@
-use std::vec::Vec;
-
 use super::{general::StatusedTypeId, imports::Imports};
 use crate::{
     analysis::{namespaces, rust_type::used_rust_type},

src/analysis/trampoline_parameters.rs

@@ -1,12 +1,11 @@
-use log::error;
-
 use super::{conversion_type::ConversionType, ref_mode::RefMode};
 use crate::{
     analysis::rust_type::rust_type,
     config::{self, parameter_matchable::ParameterMatchable},
     env::Env,
     library, nameutil,
 };
+use log::error;
 
 pub use crate::config::signals::TransformationType;
 

src/analysis/trampolines.rs

@@ -1,5 +1,3 @@
-use log::error;
-
 use super::{
     bounds::{BoundType, Bounds},
     conversion_type::ConversionType,
@@ -16,6 +14,7 @@ use crate::{
     traits::IntoString,
     version::Version,
 };
+use log::error;
 
 #[derive(Debug, Clone)]
 pub struct Trampoline {

src/chunk/chunk.rs

@@ -1,5 +1,3 @@
-use std::vec::Vec;
-
 use super::{conversion_from_glib, parameter_ffi_call_out};
 use crate::analysis::{function_parameters::TransformationType, return_value};
 

src/chunk/mod.rs

@@ -1,10 +1,11 @@
+use crate::env::Env;
+
 #[allow(clippy::module_inception)]
 mod chunk;
 pub mod conversion_from_glib;
 pub mod parameter_ffi_call_out;
 
 pub use self::chunk::{chunks, Chunk, Param, TupleMode};
-use crate::env::Env;
 
 pub fn ffi_function_todo(env: &Env, name: &str) -> Chunk {
     let sys_crate_name = env.main_sys_crate_name();

src/codegen/child_properties.rs

@@ -1,5 +1,3 @@
-use std::io::{Result, Write};
-
 use super::{general::doc_hidden, property_body};
 use crate::{
     analysis::{
@@ -12,6 +10,7 @@ use crate::{
     traits::IntoString,
     writer::{primitives::tabs, ToCode},
 };
+use std::io::{Result, Write};
 
 pub fn generate(
     w: &mut dyn Write,

src/codegen/doc/format.rs

@@ -1,8 +1,7 @@
+use crate::analysis::symbols;
 use lazy_static::lazy_static;
 use regex::{Captures, Regex};
 
-use crate::analysis::symbols;
-
 const LANGUAGE_SEP_BEGIN: &str = "<!-- language=\"";
 const LANGUAGE_SEP_END: &str = "\" -->";
 const LANGUAGE_BLOCK_BEGIN: &str = "|[";

src/codegen/doc/mod.rs

@@ -1,12 +1,3 @@
-use lazy_static::lazy_static;
-use log::{error, info};
-use regex::{Captures, Regex};
-use std::{
-    borrow::Cow,
-    io::{Result, Write},
-};
-use stripper_lib::{write_file_name, write_item_doc, Type as SType, TypeStruct};
-
 use self::format::reformat_doc;
 use crate::{
     analysis::{self, namespaces::MAIN},
@@ -19,6 +10,14 @@ use crate::{
     traits::*,
     version::Version,
 };
+use lazy_static::lazy_static;
+use log::{error, info};
+use regex::{Captures, Regex};
+use std::{
+    borrow::Cow,
+    io::{Result, Write},
+};
+use stripper_lib::{write_file_name, write_item_doc, Type as SType, TypeStruct};
 
 mod format;