From d68233e0b1ff61d09ab2c4e22a42f3326054539b Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Sun, 17 Apr 2022 20:46:43 -0500
Subject: simplify the <S> generic so it's not an Rc

---
 azalea-brigadier/src/builder/argument_builder.rs   | 37 ++++++++++++++++++----
 .../src/builder/literal_argument_builder.rs        |  2 +-
 .../src/builder/required_argument_builder.rs       |  2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'azalea-brigadier/src/builder')

diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs
index 3c9ae3ed..39edfbd3 100644
--- a/azalea-brigadier/src/builder/argument_builder.rs
+++ b/azalea-brigadier/src/builder/argument_builder.rs
@@ -1,4 +1,7 @@
-use crate::{context::CommandContext, modifier::RedirectModifier, tree::CommandNode};
+use crate::{
+    context::CommandContext, exceptions::command_syntax_exception::CommandSyntaxException,
+    modifier::RedirectModifier, tree::CommandNode,
+};
 
 use super::{literal_argument_builder::Literal, required_argument_builder::Argument};
 use std::{any::Any, cell::RefCell, fmt::Debug, rc::Rc};
@@ -10,8 +13,7 @@ pub enum ArgumentBuilderType {
 }
 
 /// A node that hasn't yet been built.
-#[derive(Clone)]
-pub struct ArgumentBuilder<S: Any + Clone> {
+pub struct ArgumentBuilder<S> {
     arguments: CommandNode<S>,
 
     command: Option<Rc<dyn Fn(&CommandContext<S>) -> i32>>,
@@ -19,11 +21,24 @@ pub struct ArgumentBuilder<S: Any + Clone> {
     target: Option<Rc<RefCell<CommandNode<S>>>>,
 
     forks: bool,
-    modifier: Option<Rc<dyn RedirectModifier<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.clone(),
+            modifier: self.modifier.clone(),
+        }
+    }
 }
 
 /// A node that isn't yet built.
-impl<S: Any + Clone> ArgumentBuilder<S> {
+impl<S> ArgumentBuilder<S> {
     pub fn new(value: ArgumentBuilderType) -> Self {
         Self {
             arguments: CommandNode {
@@ -65,10 +80,18 @@ impl<S: Any + Clone> ArgumentBuilder<S> {
         self.forward(target, None, false)
     }
 
+    pub fn fork(
+        &mut self,
+        target: Rc<RefCell<CommandNode<S>>>,
+        modifier: Rc<RedirectModifier<S>>,
+    ) -> Self {
+        self.forward(target, Some(modifier), true)
+    }
+
     pub fn forward(
         &mut self,
         target: Rc<RefCell<CommandNode<S>>>,
-        modifier: Option<Rc<dyn RedirectModifier<S>>>,
+        modifier: Option<Rc<RedirectModifier<S>>>,
         fork: bool,
     ) -> Self {
         if !self.arguments.children.is_empty() {
@@ -99,7 +122,7 @@ impl<S: Any + Clone> ArgumentBuilder<S> {
     }
 }
 
-impl<S: Any + Clone> Debug for ArgumentBuilder<S> {
+impl<S> Debug for ArgumentBuilder<S> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("ArgumentBuilder")
             .field("arguments", &self.arguments)
diff --git a/azalea-brigadier/src/builder/literal_argument_builder.rs b/azalea-brigadier/src/builder/literal_argument_builder.rs
index e5e165d8..65a5644e 100644
--- a/azalea-brigadier/src/builder/literal_argument_builder.rs
+++ b/azalea-brigadier/src/builder/literal_argument_builder.rs
@@ -21,6 +21,6 @@ impl From<Literal> for ArgumentBuilderType {
 }
 
 /// Shortcut for creating a new literal builder node.
-pub fn literal<S: Any + Clone>(value: &str) -> ArgumentBuilder<S> {
+pub fn literal<S>(value: &str) -> ArgumentBuilder<S> {
     ArgumentBuilder::new(ArgumentBuilderType::Literal(Literal::new(value)))
 }
diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs
index 0eb5d11a..cae0cddb 100644
--- a/azalea-brigadier/src/builder/required_argument_builder.rs
+++ b/azalea-brigadier/src/builder/required_argument_builder.rs
@@ -41,6 +41,6 @@ impl Debug for Argument {
 }
 
 /// Shortcut for creating a new argument builder node.
-pub fn argument<S: Any + Clone>(name: &str, parser: impl Parser + 'static) -> ArgumentBuilder<S> {
+pub fn argument<S>(name: &str, parser: impl Parser + 'static) -> ArgumentBuilder<S> {
     ArgumentBuilder::new(Argument::new(name, Rc::new(parser)).into())
 }
-- 
cgit v1.2.3