diff options
| author | mat <git@matdoes.dev> | 2024-10-26 05:29:26 +0000 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2024-10-26 05:29:26 +0000 |
| commit | 6b0fe5bf638079d535e70c3c91e78fe35a5d2a2f (patch) | |
| tree | 3b65d2984a0cffbe5acb3d44d7e3b8b145c32f95 /azalea-brigadier/src | |
| parent | b762575db61cf775d603e11eb2bd27ae13bdc4e9 (diff) | |
| download | azalea-drasl-6b0fe5bf638079d535e70c3c91e78fe35a5d2a2f.tar.xz | |
group imports with rustfmt
Diffstat (limited to 'azalea-brigadier/src')
21 files changed, 57 insertions, 51 deletions
diff --git a/azalea-brigadier/src/arguments/bool_argument_type.rs b/azalea-brigadier/src/arguments/bool_argument_type.rs index a73a9da5..efb86509 100644 --- a/azalea-brigadier/src/arguments/bool_argument_type.rs +++ b/azalea-brigadier/src/arguments/bool_argument_type.rs @@ -1,5 +1,6 @@ use std::{any::Any, sync::Arc}; +use super::ArgumentType; use crate::{ context::CommandContext, exceptions::CommandSyntaxException, @@ -7,8 +8,6 @@ use crate::{ suggestion::{Suggestions, SuggestionsBuilder}, }; -use super::ArgumentType; - #[derive(Default)] struct Boolean; diff --git a/azalea-brigadier/src/arguments/double_argument_type.rs b/azalea-brigadier/src/arguments/double_argument_type.rs index ea99f1cf..559d1cf5 100644 --- a/azalea-brigadier/src/arguments/double_argument_type.rs +++ b/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>, diff --git a/azalea-brigadier/src/arguments/float_argument_type.rs b/azalea-brigadier/src/arguments/float_argument_type.rs index 2333499a..83e298ff 100644 --- a/azalea-brigadier/src/arguments/float_argument_type.rs +++ b/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>, diff --git a/azalea-brigadier/src/arguments/integer_argument_type.rs b/azalea-brigadier/src/arguments/integer_argument_type.rs index cc4755ee..47d25e27 100644 --- a/azalea-brigadier/src/arguments/integer_argument_type.rs +++ b/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>, diff --git a/azalea-brigadier/src/arguments/long_argument_type.rs b/azalea-brigadier/src/arguments/long_argument_type.rs index 4e36abee..ba65479c 100644 --- a/azalea-brigadier/src/arguments/long_argument_type.rs +++ b/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>, diff --git a/azalea-brigadier/src/arguments/string_argument_type.rs b/azalea-brigadier/src/arguments/string_argument_type.rs index d38fbc79..96b9c998 100644 --- a/azalea-brigadier/src/arguments/string_argument_type.rs +++ b/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, diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs index 9d3e8cad..9ebe6400 100755 --- a/azalea-brigadier/src/builder/argument_builder.rs +++ b/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), diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs index 1c79f619..51f0acec 100755 --- a/azalea-brigadier/src/builder/required_argument_builder.rs +++ b/azalea-brigadier/src/builder/required_argument_builder.rs @@ -1,3 +1,5 @@ +use std::{any::Any, fmt::Debug, sync::Arc}; + use super::argument_builder::{ArgumentBuilder, ArgumentBuilderType}; use crate::{ arguments::ArgumentType, @@ -5,7 +7,6 @@ use crate::{ 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. diff --git a/azalea-brigadier/src/command_dispatcher.rs b/azalea-brigadier/src/command_dispatcher.rs index 2f4d6ebd..619131e2 100755 --- a/azalea-brigadier/src/command_dispatcher.rs +++ b/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. /// diff --git a/azalea-brigadier/src/context/command_context.rs b/azalea-brigadier/src/context/command_context.rs index 4d93006e..3d401f96 100755 --- a/azalea-brigadier/src/context/command_context.rs +++ b/azalea-brigadier/src/context/command_context.rs @@ -1,3 +1,5 @@ +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}; @@ -5,7 +7,6 @@ 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> { diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs index 95e1b5d8..3fb8ec70 100755 --- a/azalea-brigadier/src/context/command_context_builder.rs +++ b/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>, diff --git a/azalea-brigadier/src/context/parsed_argument.rs b/azalea-brigadier/src/context/parsed_argument.rs index 428851a8..ef559694 100755 --- a/azalea-brigadier/src/context/parsed_argument.rs +++ b/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, diff --git a/azalea-brigadier/src/context/parsed_command_node.rs b/azalea-brigadier/src/context/parsed_command_node.rs index 2d69c72e..62da13d8 100755 --- a/azalea-brigadier/src/context/parsed_command_node.rs +++ b/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> { diff --git a/azalea-brigadier/src/exceptions/builtin_exceptions.rs b/azalea-brigadier/src/exceptions/builtin_exceptions.rs index e60c697c..bf2072c1 100755 --- a/azalea-brigadier/src/exceptions/builtin_exceptions.rs +++ b/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 { diff --git a/azalea-brigadier/src/exceptions/command_syntax_exception.rs b/azalea-brigadier/src/exceptions/command_syntax_exception.rs index 0254820d..657649b0 100755 --- a/azalea-brigadier/src/exceptions/command_syntax_exception.rs +++ b/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, diff --git a/azalea-brigadier/src/parse_results.rs b/azalea-brigadier/src/parse_results.rs index aa7d79ea..a2cefcf7 100755 --- a/azalea-brigadier/src/parse_results.rs +++ b/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>, diff --git a/azalea-brigadier/src/string_reader.rs b/azalea-brigadier/src/string_reader.rs index 03e105dd..963a2244 100755 --- a/azalea-brigadier/src/string_reader.rs +++ b/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, diff --git a/azalea-brigadier/src/suggestion/mod.rs b/azalea-brigadier/src/suggestion/mod.rs index fbebfe8a..753b1bc8 100755 --- a/azalea-brigadier/src/suggestion/mod.rs +++ b/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 diff --git a/azalea-brigadier/src/suggestion/suggestions.rs b/azalea-brigadier/src/suggestion/suggestions.rs index 487e4233..5941aa7d 100755 --- a/azalea-brigadier/src/suggestion/suggestions.rs +++ b/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 { diff --git a/azalea-brigadier/src/suggestion/suggestions_builder.rs b/azalea-brigadier/src/suggestion/suggestions_builder.rs index 4e6296dd..85c8f4d8 100755 --- a/azalea-brigadier/src/suggestion/suggestions_builder.rs +++ b/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 { diff --git a/azalea-brigadier/src/tree/mod.rs b/azalea-brigadier/src/tree/mod.rs index a982e82b..dfa3b375 100755 --- a/azalea-brigadier/src/tree/mod.rs +++ b/azalea-brigadier/src/tree/mod.rs @@ -1,3 +1,11 @@ +use std::{ + collections::{BTreeMap, HashMap}, + fmt::Debug, + hash::Hash, + ptr, + sync::Arc, +}; + use parking_lot::RwLock; use crate::{ @@ -11,13 +19,6 @@ use crate::{ string_reader::StringReader, suggestion::{Suggestions, SuggestionsBuilder}, }; -use std::{ - collections::{BTreeMap, HashMap}, - fmt::Debug, - hash::Hash, - ptr, - sync::Arc, -}; pub type Command<S> = Option<Arc<dyn Fn(&CommandContext<S>) -> i32 + Send + Sync>>; |
