group imports with rustfmt

azalea-auth/src/auth.rs

@@ -1,18 +1,20 @@
 //! Handle Minecraft (Xbox) authentication.
 
-use crate::cache::{self, CachedAccount, ExpiringValue};
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::{
     collections::HashMap,
     path::PathBuf,
     time::{Instant, SystemTime, UNIX_EPOCH},
 };
+
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use serde_json::json;
 use thiserror::Error;
 use tracing::{error, trace};
 use uuid::Uuid;
 
+use crate::cache::{self, CachedAccount, ExpiringValue};
+
 #[derive(Default)]
 pub struct AuthOpts<'a> {
     /// Whether we should check if the user actually owns the game. This will

azalea-auth/src/cache.rs

@@ -1,8 +1,9 @@
 //! Cache auth information
 
-use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::time::{SystemTime, UNIX_EPOCH};
+
+use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::fs::File;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};

azalea-auth/src/game_profile.rs

@@ -1,6 +1,7 @@
+use std::collections::HashMap;
+
 use azalea_buf::McBuf;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use uuid::Uuid;
 
 #[derive(McBuf, Debug, Clone, Default, Eq, PartialEq)]

azalea-block/azalea-block-macros/src/lib.rs

@@ -2,11 +2,12 @@
 
 mod utils;
 
+use std::collections::HashMap;
+use std::fmt::Write;
+
 use proc_macro::TokenStream;
 use proc_macro2::TokenTree;
 use quote::quote;
-use std::collections::HashMap;
-use std::fmt::Write;
 use syn::{
     braced,
     ext::IdentExt,

azalea-block/src/generated.rs

@@ -1,7 +1,9 @@
-use crate::{Block, BlockBehavior, BlockState, BlockStates, Property};
-use azalea_block_macros::make_block_states;
 use std::fmt::Debug;
 
+use azalea_block_macros::make_block_states;
+
+use crate::{Block, BlockBehavior, BlockState, BlockStates, Property};
+
 make_block_states! {
     Properties => {
         "snowy" => Snowy(bool),

azalea-block/src/lib.rs

@@ -5,17 +5,17 @@ mod behavior;
 mod generated;
 mod range;
 
-pub use generated::{blocks, properties};
-
-use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable};
-pub use behavior::BlockBehavior;
 use core::fmt::Debug;
-pub use range::BlockStates;
 use std::{
     any::Any,
     io::{Cursor, Write},
 };
 
+use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable};
+pub use behavior::BlockBehavior;
+pub use generated::{blocks, properties};
+pub use range::BlockStates;
+
 pub trait Block: Debug + Any {
     fn behavior(&self) -> BlockBehavior;
     /// Get the Minecraft ID for this block. For example `stone` or

azalea-brigadier/src/arguments/bool_argument_type.rs

@@ -1,14 +1,13 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext,
     exceptions::CommandSyntaxException,
     string_reader::StringReader,
     suggestion::{Suggestions, SuggestionsBuilder},
 };
 
-use super::ArgumentType;
-
 #[derive(Default)]
 struct Boolean;
 

azalea-brigadier/src/arguments/double_argument_type.rs

@@ -1,13 +1,12 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext,
     exceptions::{BuiltInExceptions, CommandSyntaxException},
     string_reader::StringReader,
 };
 
-use super::ArgumentType;
-
 #[derive(Default)]
 struct Double {
     pub minimum: Option<f64>,

azalea-brigadier/src/arguments/float_argument_type.rs

@@ -1,13 +1,12 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext,
     exceptions::{BuiltInExceptions, CommandSyntaxException},
     string_reader::StringReader,
 };
 
-use super::ArgumentType;
-
 #[derive(Default)]
 struct Float {
     pub minimum: Option<f32>,

azalea-brigadier/src/arguments/integer_argument_type.rs

@@ -1,13 +1,12 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext,
     exceptions::{BuiltInExceptions, CommandSyntaxException},
     string_reader::StringReader,
 };
 
-use super::ArgumentType;
-
 #[derive(Default)]
 struct Integer {
     pub minimum: Option<i32>,

azalea-brigadier/src/arguments/long_argument_type.rs

@@ -1,13 +1,12 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext,
     exceptions::{BuiltInExceptions, CommandSyntaxException},
     string_reader::StringReader,
 };
 
-use super::ArgumentType;
-
 #[derive(Default)]
 struct Long {
     pub minimum: Option<i64>,

azalea-brigadier/src/arguments/string_argument_type.rs

@@ -1,11 +1,10 @@
 use std::{any::Any, sync::Arc};
 
+use super::ArgumentType;
 use crate::{
     context::CommandContext, exceptions::CommandSyntaxException, string_reader::StringReader,
 };
 
-use super::ArgumentType;
-
 pub enum StringArgument {
     /// Match up until the next space.
     SingleWord,

azalea-brigadier/src/builder/argument_builder.rs

@@ -1,14 +1,14 @@
+use std::{fmt::Debug, sync::Arc};
+
 use parking_lot::RwLock;
 
+use super::{literal_argument_builder::Literal, required_argument_builder::Argument};
 use crate::{
     context::CommandContext,
     modifier::RedirectModifier,
     tree::{Command, CommandNode},
 };
 
-use super::{literal_argument_builder::Literal, required_argument_builder::Argument};
-use std::{fmt::Debug, sync::Arc};
-
 #[derive(Debug, Clone)]
 pub enum ArgumentBuilderType {
     Literal(Literal),

azalea-brigadier/src/builder/required_argument_builder.rs

@@ -1,11 +1,12 @@
+use std::{any::Any, fmt::Debug, sync::Arc};
+
 use super::argument_builder::{ArgumentBuilder, ArgumentBuilderType};
 use crate::{
     arguments::ArgumentType,
     exceptions::CommandSyntaxException,
     string_reader::StringReader,
     suggestion::{Suggestions, SuggestionsBuilder},
 };
-use std::{any::Any, fmt::Debug, sync::Arc};
 
 /// An argument node type. The `T` type parameter is the type of the argument,
 /// which can be anything.

azalea-brigadier/src/command_dispatcher.rs

@@ -1,3 +1,11 @@
+use std::{
+    cmp::Ordering,
+    collections::{HashMap, HashSet},
+    mem,
+    rc::Rc,
+    sync::Arc,
+};
+
 use parking_lot::RwLock;
 
 use crate::{
@@ -9,13 +17,6 @@ use crate::{
     suggestion::{Suggestions, SuggestionsBuilder},
     tree::CommandNode,
 };
-use std::{
-    cmp::Ordering,
-    collections::{HashMap, HashSet},
-    mem,
-    rc::Rc,
-    sync::Arc,
-};
 
 /// The root of the command tree. You need to make this to register commands.
 ///

azalea-brigadier/src/context/command_context.rs

@@ -1,11 +1,12 @@
+use std::{any::Any, collections::HashMap, fmt::Debug, rc::Rc, sync::Arc};
+
 use parking_lot::RwLock;
 
 use super::{parsed_command_node::ParsedCommandNode, string_range::StringRange, ParsedArgument};
 use crate::{
     modifier::RedirectModifier,
     tree::{Command, CommandNode},
 };
-use std::{any::Any, collections::HashMap, fmt::Debug, rc::Rc, sync::Arc};
 
 /// A built `CommandContextBuilder`.
 pub struct CommandContext<S> {

azalea-brigadier/src/context/command_context_builder.rs

@@ -1,3 +1,5 @@
+use std::{collections::HashMap, fmt::Debug, rc::Rc, sync::Arc};
+
 use parking_lot::RwLock;
 
 use super::{
@@ -9,7 +11,6 @@ use crate::{
     modifier::RedirectModifier,
     tree::{Command, CommandNode},
 };
-use std::{collections::HashMap, fmt::Debug, rc::Rc, sync::Arc};
 
 pub struct CommandContextBuilder<'a, S> {
     pub arguments: HashMap<String, ParsedArgument>,

azalea-brigadier/src/context/parsed_argument.rs

@@ -1,6 +1,7 @@
-use super::string_range::StringRange;
 use std::{any::Any, sync::Arc};
 
+use super::string_range::StringRange;
+
 #[derive(Clone)]
 pub struct ParsedArgument {
     pub range: StringRange,

azalea-brigadier/src/context/parsed_command_node.rs

@@ -1,8 +1,9 @@
+use std::sync::Arc;
+
 use parking_lot::RwLock;
 
 use super::string_range::StringRange;
 use crate::tree::CommandNode;
-use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct ParsedCommandNode<S> {

azalea-brigadier/src/exceptions/builtin_exceptions.rs

@@ -1,8 +1,7 @@
 use std::fmt;
 
-use crate::string_reader::StringReader;
-
 use super::command_syntax_exception::CommandSyntaxException;
+use crate::string_reader::StringReader;
 
 #[derive(Clone, PartialEq)]
 pub enum BuiltInExceptions {

azalea-brigadier/src/exceptions/command_syntax_exception.rs

@@ -1,9 +1,10 @@
-use super::builtin_exceptions::BuiltInExceptions;
 use std::{
     cmp,
     fmt::{self, Write},
 };
 
+use super::builtin_exceptions::BuiltInExceptions;
+
 #[derive(Clone, PartialEq)]
 pub struct CommandSyntaxException {
     pub type_: BuiltInExceptions,

azalea-brigadier/src/parse_results.rs

@@ -1,8 +1,9 @@
+use std::{collections::HashMap, fmt::Debug, rc::Rc};
+
 use crate::{
     context::CommandContextBuilder, exceptions::CommandSyntaxException,
     string_reader::StringReader, tree::CommandNode,
 };
-use std::{collections::HashMap, fmt::Debug, rc::Rc};
 
 pub struct ParseResults<'a, S> {
     pub context: CommandContextBuilder<'a, S>,

azalea-brigadier/src/string_reader.rs

@@ -1,6 +1,7 @@
-use crate::exceptions::{BuiltInExceptions, CommandSyntaxException};
 use std::str::FromStr;
 
+use crate::exceptions::{BuiltInExceptions, CommandSyntaxException};
+
 #[derive(Clone)]
 pub struct StringReader {
     string: String,

azalea-brigadier/src/suggestion/mod.rs

@@ -1,20 +1,22 @@
 mod suggestions;
 mod suggestions_builder;
 
-use crate::context::StringRange;
-#[cfg(feature = "azalea-buf")]
-use azalea_buf::McBufWritable;
-#[cfg(feature = "azalea-buf")]
-use azalea_chat::FormattedText;
 #[cfg(feature = "azalea-buf")]
 use std::io::Write;
 use std::{
     fmt::{self, Display},
     hash::Hash,
 };
+
+#[cfg(feature = "azalea-buf")]
+use azalea_buf::McBufWritable;
+#[cfg(feature = "azalea-buf")]
+use azalea_chat::FormattedText;
 pub use suggestions::Suggestions;
 pub use suggestions_builder::SuggestionsBuilder;
 
+use crate::context::StringRange;
+
 /// A suggestion given to the user for what they might want to type next.
 ///
 /// The `M` generic is the type of the tooltip, so for example a `String` or

azalea-brigadier/src/suggestion/suggestions.rs

@@ -1,16 +1,18 @@
-use super::Suggestion;
-use crate::context::StringRange;
 #[cfg(feature = "azalea-buf")]
-use crate::suggestion::SuggestionValue;
+use std::io::{Cursor, Write};
+use std::{collections::HashSet, hash::Hash};
+
 #[cfg(feature = "azalea-buf")]
 use azalea_buf::{
     BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
 };
 #[cfg(feature = "azalea-buf")]
 use azalea_chat::FormattedText;
+
+use super::Suggestion;
+use crate::context::StringRange;
 #[cfg(feature = "azalea-buf")]
-use std::io::{Cursor, Write};
-use std::{collections::HashSet, hash::Hash};
+use crate::suggestion::SuggestionValue;
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Default)]
 pub struct Suggestions {

azalea-brigadier/src/suggestion/suggestions_builder.rs

@@ -1,8 +1,7 @@
 use std::collections::HashSet;
 
-use crate::context::StringRange;
-
 use super::{Suggestion, SuggestionValue, Suggestions};
+use crate::context::StringRange;
 
 #[derive(PartialEq, Debug)]
 pub struct SuggestionsBuilder {