aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--azalea-brigadier/src/builder/argument_builder.rs11
-rw-r--r--azalea-brigadier/src/builder/literal_argument_builder.rs2
-rw-r--r--azalea-brigadier/src/context.rs4
-rw-r--r--azalea-brigadier/src/dispatcher.rs10
-rw-r--r--azalea-brigadier/src/tree.rs4
5 files changed, 12 insertions, 19 deletions
diff --git a/azalea-brigadier/src/builder/argument_builder.rs b/azalea-brigadier/src/builder/argument_builder.rs
index a5388a43..dee6ccfe 100644
--- a/azalea-brigadier/src/builder/argument_builder.rs
+++ b/azalea-brigadier/src/builder/argument_builder.rs
@@ -1,10 +1,7 @@
-use crate::{
- context::CommandContext, exceptions::command_syntax_exception::CommandSyntaxException,
- modifier::RedirectModifier, tree::CommandNode,
-};
+use crate::{context::CommandContext, modifier::RedirectModifier, tree::CommandNode};
use super::{literal_argument_builder::Literal, required_argument_builder::Argument};
-use std::{any::Any, cell::RefCell, fmt::Debug, rc::Rc};
+use std::{cell::RefCell, fmt::Debug, rc::Rc};
#[derive(Debug, Clone)]
pub enum ArgumentBuilderType {
@@ -31,7 +28,7 @@ impl<S> Clone for ArgumentBuilder<S> {
command: self.command.clone(),
requirement: self.requirement.clone(),
target: self.target.clone(),
- forks: self.forks.clone(),
+ forks: self.forks,
modifier: self.modifier.clone(),
}
}
@@ -118,7 +115,7 @@ impl<S> ArgumentBuilder<S> {
literals: Default::default(),
};
- for (_, argument) in &self.arguments.children {
+ for argument in self.arguments.children.values() {
result.add_child(argument);
}
diff --git a/azalea-brigadier/src/builder/literal_argument_builder.rs b/azalea-brigadier/src/builder/literal_argument_builder.rs
index 65a5644e..6627ffdc 100644
--- a/azalea-brigadier/src/builder/literal_argument_builder.rs
+++ b/azalea-brigadier/src/builder/literal_argument_builder.rs
@@ -1,5 +1,3 @@
-use std::any::Any;
-
use super::argument_builder::{ArgumentBuilder, ArgumentBuilderType};
#[derive(Debug, Clone, Default)]
diff --git a/azalea-brigadier/src/context.rs b/azalea-brigadier/src/context.rs
index 4c36a32c..d71b3925 100644
--- a/azalea-brigadier/src/context.rs
+++ b/azalea-brigadier/src/context.rs
@@ -32,7 +32,7 @@ impl<S> Clone for CommandContextBuilder<S> {
child: self.child.clone(),
range: self.range.clone(),
modifier: self.modifier.clone(),
- forks: self.forks.clone(),
+ forks: self.forks,
}
}
}
@@ -150,7 +150,7 @@ impl<S> Clone for CommandContext<S> {
range: self.range.clone(),
child: self.child.clone(),
modifier: self.modifier.clone(),
- forks: self.forks.clone(),
+ forks: self.forks,
}
}
}
diff --git a/azalea-brigadier/src/dispatcher.rs b/azalea-brigadier/src/dispatcher.rs
index 6c30f986..9f8edce4 100644
--- a/azalea-brigadier/src/dispatcher.rs
+++ b/azalea-brigadier/src/dispatcher.rs
@@ -8,9 +8,7 @@ use crate::{
string_reader::StringReader,
tree::CommandNode,
};
-use std::{
- any::Any, cell::RefCell, cmp::Ordering, collections::HashMap, marker::PhantomData, mem, rc::Rc,
-};
+use std::{cell::RefCell, cmp::Ordering, collections::HashMap, marker::PhantomData, mem, rc::Rc};
#[derive(Default)]
pub struct CommandDispatcher<S> {
@@ -96,7 +94,7 @@ impl<S> CommandDispatcher<S> {
if let Some(redirect) = &child.borrow().redirect {
let child_context = CommandContextBuilder::new(
Rc::new(self.clone()),
- source.clone(),
+ source,
redirect.clone(),
reader.cursor,
);
@@ -168,7 +166,7 @@ impl<S> CommandDispatcher<S> {
result: &mut Vec<Vec<Rc<RefCell<CommandNode<S>>>>>,
parents: Vec<Rc<RefCell<CommandNode<S>>>>,
) {
- let mut current = parents.clone();
+ let mut current = parents;
current.push(node.clone());
result.push(current.clone());
@@ -178,7 +176,7 @@ impl<S> CommandDispatcher<S> {
}
pub fn get_path(&self, target: CommandNode<S>) -> Vec<String> {
- let rc_target = Rc::new(RefCell::new(target.clone()));
+ let rc_target = Rc::new(RefCell::new(target));
let mut nodes: Vec<Vec<Rc<RefCell<CommandNode<S>>>>> = Vec::new();
self.add_paths(self.root.clone(), &mut nodes, vec![]);
diff --git a/azalea-brigadier/src/tree.rs b/azalea-brigadier/src/tree.rs
index 3dc75de0..5ca199fa 100644
--- a/azalea-brigadier/src/tree.rs
+++ b/azalea-brigadier/src/tree.rs
@@ -11,7 +11,7 @@ use crate::{
string_range::StringRange,
string_reader::StringReader,
};
-use std::{any::Any, cell::RefCell, collections::BTreeMap, fmt::Debug, hash::Hash, ptr, rc::Rc};
+use std::{cell::RefCell, collections::BTreeMap, fmt::Debug, hash::Hash, ptr, rc::Rc};
/// An ArgumentBuilder that has been built.
#[non_exhaustive]
@@ -40,7 +40,7 @@ impl<S> Clone for CommandNode<S> {
command: self.command.clone(),
requirement: self.requirement.clone(),
redirect: self.redirect.clone(),
- forks: self.forks.clone(),
+ forks: self.forks,
modifier: self.modifier.clone(),
}
}