From 38db231ea8fa0fb223e16637db0b6ec65b2b81ef Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 12 Oct 2023 20:14:29 -0500 Subject: brigadier usages --- azalea-brigadier/src/context/command_context.rs | 4 ++-- azalea-brigadier/src/context/command_context_builder.rs | 6 +++--- azalea-brigadier/src/context/parsed_command_node.rs | 2 +- azalea-brigadier/src/context/string_range.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'azalea-brigadier/src/context') diff --git a/azalea-brigadier/src/context/command_context.rs b/azalea-brigadier/src/context/command_context.rs index f78fe758..4d93006e 100755 --- a/azalea-brigadier/src/context/command_context.rs +++ b/azalea-brigadier/src/context/command_context.rs @@ -30,7 +30,7 @@ impl Clone for CommandContext { command: self.command.clone(), root_node: self.root_node.clone(), nodes: self.nodes.clone(), - range: self.range.clone(), + range: self.range, child: self.child.clone(), modifier: self.modifier.clone(), forks: self.forks, @@ -67,7 +67,7 @@ impl CommandContext { command: self.command.clone(), root_node: self.root_node.clone(), nodes: self.nodes.clone(), - range: self.range.clone(), + range: self.range, child: self.child.clone(), modifier: self.modifier.clone(), forks: self.forks, diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs index 2fc8d4ac..99c40dac 100755 --- a/azalea-brigadier/src/context/command_context_builder.rs +++ b/azalea-brigadier/src/context/command_context_builder.rs @@ -34,7 +34,7 @@ impl Clone for CommandContextBuilder<'_, S> { source: self.source.clone(), command: self.command.clone(), child: self.child.clone(), - range: self.range.clone(), + range: self.range, modifier: self.modifier.clone(), forks: self.forks, } @@ -77,7 +77,7 @@ impl<'a, S> CommandContextBuilder<'a, S> { pub fn with_node(&mut self, node: Arc>>, range: StringRange) -> &Self { self.nodes.push(ParsedCommandNode { node: node.clone(), - range: range.clone(), + range, }); self.range = StringRange::encompassing(&self.range, &range); self.modifier = node.read().modifier.clone(); @@ -93,7 +93,7 @@ impl<'a, S> CommandContextBuilder<'a, S> { source: self.source.clone(), command: self.command.clone(), child: self.child.clone().map(|c| Rc::new(c.build(input))), - range: self.range.clone(), + range: self.range, forks: self.forks, modifier: self.modifier.clone(), input: input.to_string(), diff --git a/azalea-brigadier/src/context/parsed_command_node.rs b/azalea-brigadier/src/context/parsed_command_node.rs index bba5d121..2d69c72e 100755 --- a/azalea-brigadier/src/context/parsed_command_node.rs +++ b/azalea-brigadier/src/context/parsed_command_node.rs @@ -14,7 +14,7 @@ impl Clone for ParsedCommandNode { fn clone(&self) -> Self { Self { node: self.node.clone(), - range: self.range.clone(), + range: self.range, } } } diff --git a/azalea-brigadier/src/context/string_range.rs b/azalea-brigadier/src/context/string_range.rs index 8ca88624..75163405 100755 --- a/azalea-brigadier/src/context/string_range.rs +++ b/azalea-brigadier/src/context/string_range.rs @@ -1,6 +1,6 @@ use std::cmp; -#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)] +#[derive(Debug, Clone, PartialEq, Eq, Hash, Default, Copy)] pub struct StringRange { start: usize, end: usize, -- cgit v1.2.3