From 60b129b3a62b66dd389d1775892405fe735b9540 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Mon, 10 Jan 2022 20:29:46 -0600
Subject: progress

---
 azalea-brigadier/src/tree/command_node.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'azalea-brigadier/src/tree/command_node.rs')

diff --git a/azalea-brigadier/src/tree/command_node.rs b/azalea-brigadier/src/tree/command_node.rs
index 0d9212aa..bcba9c03 100644
--- a/azalea-brigadier/src/tree/command_node.rs
+++ b/azalea-brigadier/src/tree/command_node.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::{
-    arguments::argument_type::{ArgumentResult, ArgumentType},
+    arguments::argument_type::ArgumentType,
     builder::argument_builder::ArgumentBuilder,
     command::Command,
     context::{command_context::CommandContext, command_context_builder::CommandContextBuilder},
@@ -13,33 +13,33 @@ use crate::{
 
 use super::{argument_command_node::ArgumentCommandNode, literal_command_node::LiteralCommandNode};
 
-pub struct BaseCommandNode<S> {
-    children: HashMap<String, dyn CommandNode<S>>,
-    literals: HashMap<String, LiteralCommandNode<S>>,
-    arguments: HashMap<String, ArgumentCommandNode<S, dyn ArgumentType<ArgumentResult>>>,
-    requirement: Option<dyn Fn(&S) -> bool>,
-    redirect: Option<dyn CommandNode<S>>,
-    modifier: Option<dyn RedirectModifier<S>>,
+pub struct BaseCommandNode<'a, S, T> {
+    children: HashMap<String, &'a dyn CommandNode<S, T>>,
+    literals: HashMap<String, LiteralCommandNode<'a, S, T>>,
+    arguments: HashMap<String, ArgumentCommandNode<'a, S, T>>,
+    requirement: Option<&'a dyn Fn(&S) -> bool>,
+    redirect: Option<&'a dyn CommandNode<S, T>>,
+    modifier: Option<&'a dyn RedirectModifier<S, T>>,
     forks: bool,
-    command: Option<dyn Command<S>>,
+    command: Option<&'a dyn Command<S, T>>,
 }
 
-impl<S> BaseCommandNode<S> {}
+impl<S, T> BaseCommandNode<'_, S, T> {}
 
-pub trait CommandNode<S> {
+pub trait CommandNode<S, T> {
     fn name(&self) -> &str;
     fn usage_text(&self) -> &str;
     fn parse(
         &self,
         reader: StringReader,
-        context_builder: CommandContextBuilder<S>,
+        context_builder: CommandContextBuilder<S, T>,
     ) -> Result<(), CommandSyntaxException>;
     fn list_suggestions(
         &self,
-        context: CommandContext<S>,
+        context: CommandContext<S, T>,
         builder: SuggestionsBuilder,
     ) -> Result<Suggestions, CommandSyntaxException>;
     fn is_valid_input(&self, input: &str) -> bool;
-    fn create_builder<T>(&self) -> dyn ArgumentBuilder<S, T>;
+    fn create_builder(&self) -> dyn ArgumentBuilder<S, T>;
     fn get_examples(&self) -> Vec<String>;
 }
-- 
cgit v1.2.3