diff options
| author | mat <git@matdoes.dev> | 2023-10-10 23:21:23 -0500 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2023-10-10 23:21:23 -0500 |
| commit | 9a687f0ffebad80441e036aabe14e7cf80c774d3 (patch) | |
| tree | 2f6ad5a1a14cae23723550c934df395aab1733f6 /azalea-brigadier/src | |
| parent | 0297b8aacee27d9e86cea781b3751591e32df401 (diff) | |
| download | azalea-drasl-9a687f0ffebad80441e036aabe14e7cf80c774d3.tar.xz | |
start adding mining to pathfinder
Diffstat (limited to 'azalea-brigadier/src')
10 files changed, 25 insertions, 25 deletions
diff --git a/azalea-brigadier/src/arguments/argument_type.rs b/azalea-brigadier/src/arguments/argument_type.rs index 029e4696..f44233e1 100755 --- a/azalea-brigadier/src/arguments/argument_type.rs +++ b/azalea-brigadier/src/arguments/argument_type.rs @@ -1,7 +1,7 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{exceptions::CommandSyntaxException, string_reader::StringReader}; pub trait ArgumentType { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException>; + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException>; } diff --git a/azalea-brigadier/src/arguments/bool_argument_type.rs b/azalea-brigadier/src/arguments/bool_argument_type.rs index 1bff8aa3..2e348c7b 100644 --- a/azalea-brigadier/src/arguments/bool_argument_type.rs +++ b/azalea-brigadier/src/arguments/bool_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, exceptions::CommandSyntaxException, string_reader::StringReader, @@ -10,8 +10,8 @@ use super::ArgumentType; struct Boolean; impl ArgumentType for Boolean { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { - Ok(Rc::new(reader.read_boolean()?)) + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { + Ok(Arc::new(reader.read_boolean()?)) } } diff --git a/azalea-brigadier/src/arguments/double_argument_type.rs b/azalea-brigadier/src/arguments/double_argument_type.rs index d83bfb2a..9502a680 100644 --- a/azalea-brigadier/src/arguments/double_argument_type.rs +++ b/azalea-brigadier/src/arguments/double_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, @@ -15,7 +15,7 @@ struct Double { } impl ArgumentType for Double { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { let start = reader.cursor; let result = reader.read_double()?; if let Some(minimum) = self.minimum { @@ -38,7 +38,7 @@ impl ArgumentType for Double { .create_with_context(reader)); } } - Ok(Rc::new(result)) + Ok(Arc::new(result)) } } diff --git a/azalea-brigadier/src/arguments/float_argument_type.rs b/azalea-brigadier/src/arguments/float_argument_type.rs index 0d194efe..a2831a08 100644 --- a/azalea-brigadier/src/arguments/float_argument_type.rs +++ b/azalea-brigadier/src/arguments/float_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, @@ -15,7 +15,7 @@ struct Float { } impl ArgumentType for Float { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { let start = reader.cursor; let result = reader.read_float()?; if let Some(minimum) = self.minimum { @@ -38,7 +38,7 @@ impl ArgumentType for Float { .create_with_context(reader)); } } - Ok(Rc::new(result)) + Ok(Arc::new(result)) } } diff --git a/azalea-brigadier/src/arguments/integer_argument_type.rs b/azalea-brigadier/src/arguments/integer_argument_type.rs index 336046a7..a31a6e70 100644 --- a/azalea-brigadier/src/arguments/integer_argument_type.rs +++ b/azalea-brigadier/src/arguments/integer_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, @@ -15,7 +15,7 @@ struct Integer { } impl ArgumentType for Integer { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { let start = reader.cursor; let result = reader.read_int()?; if let Some(minimum) = self.minimum { @@ -38,7 +38,7 @@ impl ArgumentType for Integer { .create_with_context(reader)); } } - Ok(Rc::new(result)) + Ok(Arc::new(result)) } } diff --git a/azalea-brigadier/src/arguments/long_argument_type.rs b/azalea-brigadier/src/arguments/long_argument_type.rs index 9b3469b6..d557881a 100644 --- a/azalea-brigadier/src/arguments/long_argument_type.rs +++ b/azalea-brigadier/src/arguments/long_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, @@ -15,7 +15,7 @@ struct Long { } impl ArgumentType for Long { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { let start = reader.cursor; let result = reader.read_long()?; if let Some(minimum) = self.minimum { @@ -38,7 +38,7 @@ impl ArgumentType for Long { .create_with_context(reader)); } } - Ok(Rc::new(result)) + Ok(Arc::new(result)) } } diff --git a/azalea-brigadier/src/arguments/string_argument_type.rs b/azalea-brigadier/src/arguments/string_argument_type.rs index 27363bd4..9fd70d13 100644 --- a/azalea-brigadier/src/arguments/string_argument_type.rs +++ b/azalea-brigadier/src/arguments/string_argument_type.rs @@ -1,4 +1,4 @@ -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; use crate::{ context::CommandContext, exceptions::CommandSyntaxException, string_reader::StringReader, @@ -17,7 +17,7 @@ pub enum StringArgument { } impl ArgumentType for StringArgument { - fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { let result = match self { StringArgument::SingleWord => reader.read_unquoted_string().to_string(), StringArgument::QuotablePhrase => reader.read_string()?, @@ -27,7 +27,7 @@ impl ArgumentType for StringArgument { text } }; - Ok(Rc::new(result)) + Ok(Arc::new(result)) } } diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs index 0363d204..60fa713f 100755 --- a/azalea-brigadier/src/builder/required_argument_builder.rs +++ b/azalea-brigadier/src/builder/required_argument_builder.rs @@ -2,7 +2,7 @@ use super::argument_builder::{ArgumentBuilder, ArgumentBuilderType}; use crate::{ arguments::ArgumentType, exceptions::CommandSyntaxException, string_reader::StringReader, }; -use std::{any::Any, fmt::Debug, rc::Rc, sync::Arc}; +use std::{any::Any, fmt::Debug, sync::Arc}; /// An argument node type. The `T` type parameter is the type of the argument, /// which can be anything. @@ -19,7 +19,7 @@ impl Argument { } } - pub fn parse(&self, reader: &mut StringReader) -> Result<Rc<dyn Any>, CommandSyntaxException> { + pub fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxException> { self.parser.parse(reader) } } diff --git a/azalea-brigadier/src/context/command_context.rs b/azalea-brigadier/src/context/command_context.rs index a8efeeeb..f78fe758 100755 --- a/azalea-brigadier/src/context/command_context.rs +++ b/azalea-brigadier/src/context/command_context.rs @@ -78,7 +78,7 @@ impl<S> CommandContext<S> { !self.nodes.is_empty() } - pub fn argument(&self, name: &str) -> Option<Rc<dyn Any>> { + pub fn argument(&self, name: &str) -> Option<Arc<dyn Any>> { let argument = self.arguments.get(name); argument.map(|a| a.result.clone()) } diff --git a/azalea-brigadier/src/context/parsed_argument.rs b/azalea-brigadier/src/context/parsed_argument.rs index 3302b1be..428851a8 100755 --- a/azalea-brigadier/src/context/parsed_argument.rs +++ b/azalea-brigadier/src/context/parsed_argument.rs @@ -1,8 +1,8 @@ use super::string_range::StringRange; -use std::{any::Any, rc::Rc}; +use std::{any::Any, sync::Arc}; #[derive(Clone)] pub struct ParsedArgument { pub range: StringRange, - pub result: Rc<dyn Any>, + pub result: Arc<dyn Any>, } |
