clippo the sequel

5 files changed, 31 insertions, 17 deletions

diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs
index d26b2a8a..38ccc98c 100755
--- a/azalea-brigadier/src/builder/argument_builder.rs
+++ b/azalea-brigadier/src/builder/argument_builder.rs
@@ -1,4 +1,8 @@
-use crate::{context::CommandContext, modifier::RedirectModifier, tree::CommandNode};
+use crate::{
+    context::CommandContext,
+    modifier::RedirectModifier,
+    tree::{Command, CommandNode},
+};
 
 use super::{literal_argument_builder::Literal, required_argument_builder::Argument};
 use std::{cell::RefCell, fmt::Debug, rc::Rc};
@@ -13,7 +17,7 @@ pub enum ArgumentBuilderType {
 pub struct ArgumentBuilder<S> {
     arguments: CommandNode<S>,
 
-    command: Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
+    command: Command<S>,
     requirement: Rc<dyn Fn(Rc<S>) -> bool>,
     target: Option<Rc<RefCell<CommandNode<S>>>>,
 
diff --git a/azalea-brigadier/src/context/command_context.rs b/azalea-brigadier/src/context/command_context.rs
index 1834a73d..98609a6e 100755
--- a/azalea-brigadier/src/context/command_context.rs
+++ b/azalea-brigadier/src/context/command_context.rs
@@ -1,5 +1,8 @@
 use super::{parsed_command_node::ParsedCommandNode, string_range::StringRange, ParsedArgument};
-use crate::{modifier::RedirectModifier, tree::CommandNode};
+use crate::{
+    modifier::RedirectModifier,
+    tree::{Command, CommandNode},
+};
 use std::{any::Any, cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
 
 /// A built `CommandContextBuilder`.
@@ -7,7 +10,7 @@ pub struct CommandContext<S> {
     pub source: Rc<S>,
     pub input: String,
     pub arguments: HashMap<String, ParsedArgument>,
-    pub command: Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
+    pub command: Command<S>,
     pub root_node: Rc<RefCell<CommandNode<S>>>,
     pub nodes: Vec<ParsedCommandNode<S>>,
     pub range: StringRange,
diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs
index f192f6b7..7516ab9e 100755
--- a/azalea-brigadier/src/context/command_context_builder.rs
+++ b/azalea-brigadier/src/context/command_context_builder.rs
@@ -2,7 +2,11 @@ use super::{
     command_context::CommandContext, parsed_command_node::ParsedCommandNode,
     string_range::StringRange, ParsedArgument,
 };
-use crate::{command_dispatcher::CommandDispatcher, modifier::RedirectModifier, tree::CommandNode};
+use crate::{
+    command_dispatcher::CommandDispatcher,
+    modifier::RedirectModifier,
+    tree::{Command, CommandNode},
+};
 use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
 
 pub struct CommandContextBuilder<S> {
@@ -11,7 +15,7 @@ pub struct CommandContextBuilder<S> {
     pub nodes: Vec<ParsedCommandNode<S>>,
     pub dispatcher: Rc<CommandDispatcher<S>>,
     pub source: Rc<S>,
-    pub command: Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
+    pub command: Command<S>,
     pub child: Option<Rc<CommandContextBuilder<S>>>,
     pub range: StringRange,
     pub modifier: Option<Rc<RedirectModifier<S>>>,
@@ -56,10 +60,7 @@ impl<S> CommandContextBuilder<S> {
         }
     }
 
-    pub fn with_command(
-        &mut self,
-        command: &Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
-    ) -> &Self {
+    pub fn with_command(&mut self, command: &Command<S>) -> &Self {
         self.command = command.clone();
         self
     }
diff --git a/azalea-brigadier/src/exceptions/command_syntax_exception.rs b/azalea-brigadier/src/exceptions/command_syntax_exception.rs
index 4bfe9cda..14376a87 100755
--- a/azalea-brigadier/src/exceptions/command_syntax_exception.rs
+++ b/azalea-brigadier/src/exceptions/command_syntax_exception.rs
@@ -1,7 +1,9 @@
-use std::{cmp, fmt};
-
 use super::builtin_exceptions::BuiltInExceptions;
 use crate::message::Message;
+use std::{
+    cmp,
+    fmt::{self, Write},
+};
 
 #[derive(Clone, PartialEq)]
 pub struct CommandSyntaxException {
@@ -36,11 +38,13 @@ impl CommandSyntaxException {
         let mut message = self.message.string();
         let context = self.context();
         if let Some(context) = context {
-            message.push_str(&format!(
+            write!(
+                message,
                 " at position {}: {}",
                 self.cursor.unwrap_or(usize::MAX),
                 context
-            ));
+            )
+            .unwrap();
         }
         message
     }
diff --git a/azalea-brigadier/src/tree/mod.rs b/azalea-brigadier/src/tree/mod.rs
index b6181c73..ef2573b9 100755
--- a/azalea-brigadier/src/tree/mod.rs
+++ b/azalea-brigadier/src/tree/mod.rs
@@ -10,6 +10,8 @@ use crate::{
 };
 use std::{cell::RefCell, collections::HashMap, fmt::Debug, hash::Hash, ptr, rc::Rc};
 
+pub type Command<S> = Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>;
+
 /// An ArgumentBuilder that has been built.
 #[non_exhaustive]
 pub struct CommandNode<S> {
@@ -19,7 +21,7 @@ pub struct CommandNode<S> {
     pub literals: HashMap<String, Rc<RefCell<CommandNode<S>>>>,
     pub arguments: HashMap<String, Rc<RefCell<CommandNode<S>>>>,
 
-    pub command: Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
+    pub command: Command<S>,
     pub requirement: Rc<dyn Fn(Rc<S>) -> bool>,
     pub redirect: Option<Rc<RefCell<CommandNode<S>>>>,
     pub forks: bool,
@@ -75,9 +77,9 @@ impl<S> CommandNode<S> {
             input.cursor = cursor;
             let literal = literals.get(&text);
             if let Some(literal) = literal {
-                return vec![literal.clone()];
+                vec![literal.clone()]
             } else {
-                return self.arguments.values().cloned().collect();
+                self.arguments.values().cloned().collect()
             }
         } else {
             self.arguments.values().cloned().collect()