From 1b888881516c7553126e0c7fc2539d14b129e29e Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 2 Feb 2022 07:57:50 -0600 Subject: [PATCH] f --- azalea-brigadier/src/context/command_context_builder.rs | 7 ++----- azalea-brigadier/src/tree/command_node.rs | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs index 969f9cfd..ba25849c 100644 --- a/azalea-brigadier/src/context/command_context_builder.rs +++ b/azalea-brigadier/src/context/command_context_builder.rs @@ -45,14 +45,11 @@ pub struct CommandContextBuilder<'a, S> { // this.range = StringRange.at(start); // } -impl CommandContextBuilder<'_, S> -where - , -{ +impl CommandContextBuilder<'_, S> { pub fn new( dispatcher: CommandDispatcher, source: S, - root_node: dyn CommandNodeTrait, + root_node: &dyn CommandNodeTrait, start: usize, ) -> Self { Self { diff --git a/azalea-brigadier/src/tree/command_node.rs b/azalea-brigadier/src/tree/command_node.rs index b7801363..30907163 100644 --- a/azalea-brigadier/src/tree/command_node.rs +++ b/azalea-brigadier/src/tree/command_node.rs @@ -21,14 +21,14 @@ enum CommandNodeEnum<'a, S> { Root(RootCommandNode<'a, S>), } -impl Deref for CommandNodeEnum<'_, S> { +impl<'a, S> Deref for CommandNodeEnum<'a, S> { type Target = dyn CommandNodeTrait; fn deref(&self) -> &Self::Target { match self { - CommandNodeEnum::Literal(node) => node, - CommandNodeEnum::Argument(node) => node, - CommandNodeEnum::Root(node) => node, + CommandNodeEnum::Literal(node) => *node as &Self::Target, + CommandNodeEnum::Argument(node) => *node as &Self::Target, + CommandNodeEnum::Root(node) => *node as &Self::Target, } } }