From 2e2d874e27975721343ee69d20c1f034853111a8 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Thu, 4 May 2023 23:59:24 -0500
Subject: remove unnecessary clones in brigadier

---
 azalea-brigadier/src/builder/argument_builder.rs | 35 ++++++++----------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs
index 38ccc98c..cfaff618 100755
--- a/azalea-brigadier/src/builder/argument_builder.rs
+++ b/azalea-brigadier/src/builder/argument_builder.rs
@@ -25,19 +25,6 @@ pub struct ArgumentBuilder<S> {
     modifier: Option<Rc<RedirectModifier<S>>>,
 }
 
-impl<S> Clone for ArgumentBuilder<S> {
-    fn clone(&self) -> Self {
-        Self {
-            arguments: self.arguments.clone(),
-            command: self.command.clone(),
-            requirement: self.requirement.clone(),
-            target: self.target.clone(),
-            forks: self.forks,
-            modifier: self.modifier.clone(),
-        }
-    }
-}
-
 /// A node that isn't yet built.
 impl<S> ArgumentBuilder<S> {
     pub fn new(value: ArgumentBuilderType) -> Self {
@@ -54,37 +41,37 @@ impl<S> ArgumentBuilder<S> {
         }
     }
 
-    pub fn then(&mut self, argument: ArgumentBuilder<S>) -> Self {
+    pub fn then(self, argument: ArgumentBuilder<S>) -> Self {
         self.then_built(argument.build())
     }
 
-    pub fn then_built(&mut self, argument: CommandNode<S>) -> Self {
+    pub fn then_built(mut self, argument: CommandNode<S>) -> Self {
         self.arguments.add_child(&Rc::new(RefCell::new(argument)));
-        self.clone()
+        self
     }
 
-    pub fn executes<F>(&mut self, f: F) -> Self
+    pub fn executes<F>(mut self, f: F) -> Self
     where
         F: Fn(&CommandContext<S>) -> i32 + 'static,
     {
         self.command = Some(Rc::new(f));
-        self.clone()
+        self
     }
 
-    pub fn requires<F>(&mut self, requirement: F) -> Self
+    pub fn requires<F>(mut self, requirement: F) -> Self
     where
         F: Fn(Rc<S>) -> bool + 'static,
     {
         self.requirement = Rc::new(requirement);
-        self.clone()
+        self
     }
 
-    pub fn redirect(&mut self, target: Rc<RefCell<CommandNode<S>>>) -> Self {
+    pub fn redirect(self, target: Rc<RefCell<CommandNode<S>>>) -> Self {
         self.forward(target, None, false)
     }
 
     pub fn fork(
-        &mut self,
+        self,
         target: Rc<RefCell<CommandNode<S>>>,
         modifier: Rc<RedirectModifier<S>>,
     ) -> Self {
@@ -92,7 +79,7 @@ impl<S> ArgumentBuilder<S> {
     }
 
     pub fn forward(
-        &mut self,
+        mut self,
         target: Rc<RefCell<CommandNode<S>>>,
         modifier: Option<Rc<RedirectModifier<S>>>,
         fork: bool,
@@ -103,7 +90,7 @@ impl<S> ArgumentBuilder<S> {
         self.target = Some(target);
         self.modifier = modifier;
         self.forks = fork;
-        self.clone()
+        self
     }
 
     pub fn build(self) -> CommandNode<S> {
-- 
cgit v1.2.3