diff options
| author | mat <git@matdoes.dev> | 2025-12-11 23:21:42 -1030 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-12-11 23:21:42 -1030 |
| commit | ca70e5e321a3c174c53d0650feed84db471ac30d (patch) | |
| tree | 43042fa40c2f3d7f30ea56e1ee84c59dcb13be66 /azalea-brigadier | |
| parent | 918214e8ba4eae65daf5d2da17aa0022f2ae5212 (diff) | |
| download | azalea-drasl-ca70e5e321a3c174c53d0650feed84db471ac30d.tar.xz | |
enable str_to_string clippy lint
Diffstat (limited to 'azalea-brigadier')
18 files changed, 102 insertions, 102 deletions
diff --git a/azalea-brigadier/src/arguments/bool_argument_type.rs b/azalea-brigadier/src/arguments/bool_argument_type.rs index 225e985e..5005cda4 100644 --- a/azalea-brigadier/src/arguments/bool_argument_type.rs +++ b/azalea-brigadier/src/arguments/bool_argument_type.rs @@ -27,7 +27,7 @@ impl ArgumentType for Boolean { } fn examples(&self) -> Vec<String> { - vec!["true".to_string(), "false".to_string()] + vec!["true".to_owned(), "false".to_owned()] } } diff --git a/azalea-brigadier/src/arguments/double_argument_type.rs b/azalea-brigadier/src/arguments/double_argument_type.rs index 5b5d8cce..f4d1d05f 100644 --- a/azalea-brigadier/src/arguments/double_argument_type.rs +++ b/azalea-brigadier/src/arguments/double_argument_type.rs @@ -43,7 +43,7 @@ impl ArgumentType for Double { fn examples(&self) -> Vec<String> { vec!["0", "1.2", ".5", "-1", "-.5", "-1234.56"] .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect() } } diff --git a/azalea-brigadier/src/arguments/float_argument_type.rs b/azalea-brigadier/src/arguments/float_argument_type.rs index 8ea3a417..766a733f 100644 --- a/azalea-brigadier/src/arguments/float_argument_type.rs +++ b/azalea-brigadier/src/arguments/float_argument_type.rs @@ -43,7 +43,7 @@ impl ArgumentType for Float { fn examples(&self) -> Vec<String> { vec!["0", "1.2", ".5", "-1", "-.5", "-1234.56"] .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect() } } diff --git a/azalea-brigadier/src/arguments/integer_argument_type.rs b/azalea-brigadier/src/arguments/integer_argument_type.rs index 9cdb9c34..ea547f06 100644 --- a/azalea-brigadier/src/arguments/integer_argument_type.rs +++ b/azalea-brigadier/src/arguments/integer_argument_type.rs @@ -43,7 +43,7 @@ impl ArgumentType for Integer { fn examples(&self) -> Vec<String> { vec!["0", "123", "-123"] .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect() } } diff --git a/azalea-brigadier/src/arguments/long_argument_type.rs b/azalea-brigadier/src/arguments/long_argument_type.rs index 1d4b3c9b..de9b27cc 100644 --- a/azalea-brigadier/src/arguments/long_argument_type.rs +++ b/azalea-brigadier/src/arguments/long_argument_type.rs @@ -43,7 +43,7 @@ impl ArgumentType for Long { fn examples(&self) -> Vec<String> { vec!["0", "123", "-123"] .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect() } } diff --git a/azalea-brigadier/src/arguments/string_argument_type.rs b/azalea-brigadier/src/arguments/string_argument_type.rs index bcb040d6..b074132f 100644 --- a/azalea-brigadier/src/arguments/string_argument_type.rs +++ b/azalea-brigadier/src/arguments/string_argument_type.rs @@ -16,10 +16,10 @@ pub enum StringArgument { impl ArgumentType for StringArgument { fn parse(&self, reader: &mut StringReader) -> Result<Arc<dyn Any>, CommandSyntaxError> { let result = match self { - StringArgument::SingleWord => reader.read_unquoted_string().to_string(), + StringArgument::SingleWord => reader.read_unquoted_string().to_owned(), StringArgument::QuotablePhrase => reader.read_string()?, StringArgument::GreedyPhrase => { - let text = reader.remaining().to_string(); + let text = reader.remaining().to_owned(); reader.cursor = reader.total_length(); text } @@ -34,7 +34,7 @@ impl ArgumentType for StringArgument { StringArgument::GreedyPhrase => vec!["word", "words with spaces", "\"and symbols\""], } .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect() } } diff --git a/azalea-brigadier/src/builder/literal_argument_builder.rs b/azalea-brigadier/src/builder/literal_argument_builder.rs index ea5db2d3..9761609e 100644 --- a/azalea-brigadier/src/builder/literal_argument_builder.rs +++ b/azalea-brigadier/src/builder/literal_argument_builder.rs @@ -7,7 +7,7 @@ pub struct Literal { impl Literal { pub fn new(value: &str) -> Self { Self { - value: value.to_string(), + value: value.to_owned(), } } } diff --git a/azalea-brigadier/src/builder/required_argument_builder.rs b/azalea-brigadier/src/builder/required_argument_builder.rs index 5aca8617..01bfc0bc 100644 --- a/azalea-brigadier/src/builder/required_argument_builder.rs +++ b/azalea-brigadier/src/builder/required_argument_builder.rs @@ -28,7 +28,7 @@ impl<S> Argument<S> { custom_suggestions: Option<Arc<dyn SuggestionProvider<S> + Send + Sync>>, ) -> Self { Self { - name: name.to_string(), + name: name.to_owned(), parser, custom_suggestions, } diff --git a/azalea-brigadier/src/command_dispatcher.rs b/azalea-brigadier/src/command_dispatcher.rs index a2024139..ecf5d157 100644 --- a/azalea-brigadier/src/command_dispatcher.rs +++ b/azalea-brigadier/src/command_dispatcher.rs @@ -214,7 +214,7 @@ impl<S> CommandDispatcher<S> { let mut result: Vec<String> = Vec::with_capacity(list.len()); for node in list { if !Arc::ptr_eq(&node, &self.root) { - result.push(node.read().name().to_string()); + result.push(node.read().name().to_owned()); } } return result; @@ -289,7 +289,7 @@ impl<S> CommandDispatcher<S> { match &node.redirect { Some(redirect) => { let redirect = if ptr::eq(redirect.data_ptr(), self.root.data_ptr()) { - "...".to_string() + "...".to_owned() } else { format!("-> {}", redirect.read().usage_text()) }; @@ -367,7 +367,7 @@ impl<S> CommandDispatcher<S> { if let Some(redirect) = &node.redirect { let redirect = if ptr::eq(redirect.data_ptr(), self.root.data_ptr()) { - "...".to_string() + "...".to_owned() } else { format!("-> {}", redirect.read().usage_text()) }; diff --git a/azalea-brigadier/src/context/command_context_builder.rs b/azalea-brigadier/src/context/command_context_builder.rs index f8d4334d..a3819246 100644 --- a/azalea-brigadier/src/context/command_context_builder.rs +++ b/azalea-brigadier/src/context/command_context_builder.rs @@ -77,7 +77,7 @@ impl<'a, S> CommandContextBuilder<'a, S> { self } pub fn with_argument(&mut self, name: &str, argument: ParsedArgument) -> &Self { - self.arguments.insert(name.to_string(), argument); + self.arguments.insert(name.to_owned(), argument); self } pub fn with_node(&mut self, node: Arc<RwLock<CommandNode<S>>>, range: StringRange) -> &Self { @@ -102,7 +102,7 @@ impl<'a, S> CommandContextBuilder<'a, S> { range: self.range, forks: self.forks, modifier: self.modifier.clone(), - input: input.to_string(), + input: input.to_owned(), } } diff --git a/azalea-brigadier/src/errors/command_syntax_error.rs b/azalea-brigadier/src/errors/command_syntax_error.rs index a476fec4..fd97b050 100644 --- a/azalea-brigadier/src/errors/command_syntax_error.rs +++ b/azalea-brigadier/src/errors/command_syntax_error.rs @@ -20,7 +20,7 @@ impl CommandSyntaxError { Self { kind, message, - input: Some(input.to_string()), + input: Some(input.to_owned()), cursor: Some(cursor), } } diff --git a/azalea-brigadier/src/string_reader.rs b/azalea-brigadier/src/string_reader.rs index 8dd41ed3..e3ab99ff 100644 --- a/azalea-brigadier/src/string_reader.rs +++ b/azalea-brigadier/src/string_reader.rs @@ -20,7 +20,7 @@ impl From<String> for StringReader { impl From<&str> for StringReader { fn from(string: &str) -> Self { Self { - string: string.to_string(), + string: string.to_owned(), cursor: 0, } } @@ -104,7 +104,7 @@ impl StringReader { if result.is_err() { self.cursor = start; return Err(BuiltInError::ReaderInvalidInt { - value: number.to_string(), + value: number.to_owned(), } .create_with_context(self)); } @@ -125,7 +125,7 @@ impl StringReader { if result.is_err() { self.cursor = start; return Err(BuiltInError::ReaderInvalidLong { - value: number.to_string(), + value: number.to_owned(), } .create_with_context(self)); } @@ -146,7 +146,7 @@ impl StringReader { if result.is_err() { self.cursor = start; return Err(BuiltInError::ReaderInvalidDouble { - value: number.to_string(), + value: number.to_owned(), } .create_with_context(self)); } @@ -167,7 +167,7 @@ impl StringReader { if result.is_err() { self.cursor = start; return Err(BuiltInError::ReaderInvalidFloat { - value: number.to_string(), + value: number.to_owned(), } .create_with_context(self)); } @@ -240,7 +240,7 @@ impl StringReader { self.skip(); return self.read_string_until(next); } - Ok(self.read_unquoted_string().to_string()) + Ok(self.read_unquoted_string().to_owned()) } pub fn read_boolean(&mut self) -> Result<bool, CommandSyntaxError> { diff --git a/azalea-brigadier/src/suggestion/mod.rs b/azalea-brigadier/src/suggestion/mod.rs index 8a43489a..9c2c57f5 100644 --- a/azalea-brigadier/src/suggestion/mod.rs +++ b/azalea-brigadier/src/suggestion/mod.rs @@ -41,7 +41,7 @@ impl Suggestion { pub fn new(range: StringRange, text: &str) -> Suggestion { Suggestion { range, - value: SuggestionValue::Text(text.to_string()), + value: SuggestionValue::Text(text.to_owned()), tooltip: None, } } @@ -49,7 +49,7 @@ impl Suggestion { pub fn new_with_tooltip(range: StringRange, text: &str, tooltip: String) -> Self { Self { range, - value: SuggestionValue::Text(text.to_string()), + value: SuggestionValue::Text(text.to_owned()), tooltip: Some(tooltip), } } diff --git a/azalea-brigadier/src/suggestion/suggestions_builder.rs b/azalea-brigadier/src/suggestion/suggestions_builder.rs index 85c8f4d8..06228947 100644 --- a/azalea-brigadier/src/suggestion/suggestions_builder.rs +++ b/azalea-brigadier/src/suggestion/suggestions_builder.rs @@ -21,10 +21,10 @@ impl SuggestionsBuilder { pub fn new_with_lowercase(input: &str, input_lowercase: &str, start: usize) -> Self { Self { start, - input: input.to_string(), - input_lowercase: input_lowercase.to_string(), - remaining: input[start..].to_string(), - remaining_lowercase: input_lowercase[start..].to_string(), + input: input.to_owned(), + input_lowercase: input_lowercase.to_owned(), + remaining: input[start..].to_owned(), + remaining_lowercase: input_lowercase[start..].to_owned(), result: HashSet::new(), } } @@ -57,7 +57,7 @@ impl SuggestionsBuilder { } self.result.insert(Suggestion { range: StringRange::between(self.start, self.input.len()), - value: SuggestionValue::Text(text.to_string()), + value: SuggestionValue::Text(text.to_owned()), tooltip: None, }); self @@ -69,7 +69,7 @@ impl SuggestionsBuilder { } self.result.insert(Suggestion { range: StringRange::between(self.start, self.input.len()), - value: SuggestionValue::Text(text.to_string()), + value: SuggestionValue::Text(text.to_owned()), tooltip: Some(tooltip), }); self diff --git a/azalea-brigadier/src/tree/mod.rs b/azalea-brigadier/src/tree/mod.rs index a8c12117..b9b11fd6 100644 --- a/azalea-brigadier/src/tree/mod.rs +++ b/azalea-brigadier/src/tree/mod.rs @@ -126,7 +126,7 @@ impl<S> CommandNode<S> { } } else { self.children - .insert(node.read().name().to_string(), node.clone()); + .insert(node.read().name().to_owned(), node.clone()); match &node.read().value { ArgumentBuilderType::Literal(literal) => { self.literals.insert(literal.value.clone(), node.clone()); diff --git a/azalea-brigadier/tests/command_dispatcher_test.rs b/azalea-brigadier/tests/command_dispatcher_test.rs index a9dea5bf..d6a3f2cc 100644 --- a/azalea-brigadier/tests/command_dispatcher_test.rs +++ b/azalea-brigadier/tests/command_dispatcher_test.rs @@ -337,7 +337,7 @@ fn get_path() { assert_eq!( subject.get_path(bar), - vec!["foo".to_string(), "bar".to_string()] + vec!["foo".to_owned(), "bar".to_owned()] ); } diff --git a/azalea-brigadier/tests/string_reader_test.rs b/azalea-brigadier/tests/string_reader_test.rs index 3b70043b..0f0c4171 100644 --- a/azalea-brigadier/tests/string_reader_test.rs +++ b/azalea-brigadier/tests/string_reader_test.rs @@ -2,7 +2,7 @@ use azalea_brigadier::{errors::BuiltInError, string_reader::StringReader}; #[test] fn can_read() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); assert!(reader.can_read()); reader.skip(); // 'a' assert!(reader.can_read()); @@ -14,7 +14,7 @@ fn can_read() { #[test] fn get_remaining_length() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); assert_eq!(reader.remaining_length(), 3); reader.cursor = 1; assert_eq!(reader.remaining_length(), 2); @@ -26,7 +26,7 @@ fn get_remaining_length() { #[test] fn can_read_length() { - let reader = StringReader::from("abc".to_string()); + let reader = StringReader::from("abc".to_owned()); assert!(reader.can_read_length(1)); assert!(reader.can_read_length(2)); assert!(reader.can_read_length(3)); @@ -36,7 +36,7 @@ fn can_read_length() { #[test] fn peek() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); assert_eq!(reader.peek(), 'a'); assert_eq!(reader.cursor(), 0); reader.cursor = 2; @@ -46,7 +46,7 @@ fn peek() { #[test] fn peek_length() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); assert_eq!(reader.peek_offset(0), 'a'); assert_eq!(reader.peek_offset(2), 'c'); assert_eq!(reader.cursor(), 0); @@ -57,7 +57,7 @@ fn peek_length() { #[test] fn read() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); assert_eq!(reader.read(), 'a'); assert_eq!(reader.read(), 'b'); assert_eq!(reader.read(), 'c'); @@ -66,14 +66,14 @@ fn read() { #[test] fn skip() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); reader.skip(); assert_eq!(reader.cursor(), 1); } #[test] fn get_remaining() { - let mut reader = StringReader::from("Hello!".to_string()); + let mut reader = StringReader::from("Hello!".to_owned()); assert_eq!(reader.remaining(), "Hello!"); reader.cursor = 3; assert_eq!(reader.remaining(), "lo!"); @@ -83,7 +83,7 @@ fn get_remaining() { #[test] fn get_read() { - let mut reader = StringReader::from("Hello!".to_string()); + let mut reader = StringReader::from("Hello!".to_owned()); assert_eq!(reader.get_read(), ""); reader.cursor = 3; assert_eq!(reader.get_read(), "Hel"); @@ -93,28 +93,28 @@ fn get_read() { #[test] fn skip_whitespace_none() { - let mut reader = StringReader::from("Hello!".to_string()); + let mut reader = StringReader::from("Hello!".to_owned()); reader.skip_whitespace(); assert_eq!(reader.cursor(), 0); } #[test] fn skip_whitespace_mixed() { - let mut reader = StringReader::from(" \t \t\nHello!".to_string()); + let mut reader = StringReader::from(" \t \t\nHello!".to_owned()); reader.skip_whitespace(); assert_eq!(reader.cursor(), 5); } #[test] fn skip_whitespace_empty() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); reader.skip_whitespace(); assert_eq!(reader.cursor(), 0); } #[test] fn read_unquoted_string() { - let mut reader = StringReader::from("hello world".to_string()); + let mut reader = StringReader::from("hello world".to_owned()); assert_eq!(reader.read_unquoted_string(), "hello"); assert_eq!(reader.get_read(), "hello"); assert_eq!(reader.remaining(), " world"); @@ -122,7 +122,7 @@ fn read_unquoted_string() { #[test] fn read_unquoted_string_empty() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); assert_eq!(reader.read_unquoted_string(), ""); assert_eq!(reader.get_read(), ""); assert_eq!(reader.remaining(), ""); @@ -130,7 +130,7 @@ fn read_unquoted_string_empty() { #[test] fn read_unquoted_string_empty_with_remaining() { - let mut reader = StringReader::from(" hello world".to_string()); + let mut reader = StringReader::from(" hello world".to_owned()); assert_eq!(reader.read_unquoted_string(), ""); assert_eq!(reader.get_read(), ""); assert_eq!(reader.remaining(), " hello world"); @@ -138,7 +138,7 @@ fn read_unquoted_string_empty_with_remaining() { #[test] fn read_quoted_string() { - let mut reader = StringReader::from("\"hello world\"".to_string()); + let mut reader = StringReader::from("\"hello world\"".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "\"hello world\""); assert_eq!(reader.remaining(), ""); @@ -146,7 +146,7 @@ fn read_quoted_string() { #[test] fn read_single_quoted_string() { - let mut reader = StringReader::from("'hello world'".to_string()); + let mut reader = StringReader::from("'hello world'".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "'hello world'"); assert_eq!(reader.remaining(), ""); @@ -154,7 +154,7 @@ fn read_single_quoted_string() { #[test] fn read_mixed_quoted_string_double_inside_single() { - let mut reader = StringReader::from("'hello \"world\"'".to_string()); + let mut reader = StringReader::from("'hello \"world\"'".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello \"world\""); assert_eq!(reader.get_read(), "'hello \"world\"'"); assert_eq!(reader.remaining(), ""); @@ -162,7 +162,7 @@ fn read_mixed_quoted_string_double_inside_single() { #[test] fn read_mixed_quoted_string_single_inside_double() { - let mut reader = StringReader::from("\"hello 'world'\"".to_string()); + let mut reader = StringReader::from("\"hello 'world'\"".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello 'world'"); assert_eq!(reader.get_read(), "\"hello 'world'\""); assert_eq!(reader.remaining(), ""); @@ -170,7 +170,7 @@ fn read_mixed_quoted_string_single_inside_double() { #[test] fn read_quoted_string_empty_quoted() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), ""); assert_eq!(reader.get_read(), ""); assert_eq!(reader.remaining(), ""); @@ -178,7 +178,7 @@ fn read_quoted_string_empty_quoted() { #[test] fn read_quoted_string_empty_quoted_with_remaining() { - let mut reader = StringReader::from("\"\" hello world".to_string()); + let mut reader = StringReader::from("\"\" hello world".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), ""); assert_eq!(reader.get_read(), "\"\""); assert_eq!(reader.remaining(), " hello world"); @@ -186,7 +186,7 @@ fn read_quoted_string_empty_quoted_with_remaining() { #[test] fn read_quoted_string_with_escaped_quote() { - let mut reader = StringReader::from("\"hello \\\"world\\\"\"".to_string()); + let mut reader = StringReader::from("\"hello \\\"world\\\"\"".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello \"world\""); assert_eq!(reader.get_read(), "\"hello \\\"world\\\"\""); assert_eq!(reader.remaining(), ""); @@ -194,7 +194,7 @@ fn read_quoted_string_with_escaped_quote() { #[test] fn read_quoted_string_with_escaped_escapes() { - let mut reader = StringReader::from("\"\\\\o/\"".to_string()); + let mut reader = StringReader::from("\"\\\\o/\"".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "\\o/"); assert_eq!(reader.get_read(), "\"\\\\o/\""); assert_eq!(reader.remaining(), ""); @@ -202,7 +202,7 @@ fn read_quoted_string_with_escaped_escapes() { #[test] fn read_quoted_string_with_remaining() { - let mut reader = StringReader::from("\"hello world\" foo bar".to_string()); + let mut reader = StringReader::from("\"hello world\" foo bar".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "\"hello world\""); assert_eq!(reader.remaining(), " foo bar"); @@ -210,7 +210,7 @@ fn read_quoted_string_with_remaining() { #[test] fn read_quoted_string_with_immediate_remaining() { - let mut reader = StringReader::from("\"hello world\"foo bar".to_string()); + let mut reader = StringReader::from("\"hello world\"foo bar".to_owned()); assert_eq!(reader.read_quoted_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "\"hello world\""); assert_eq!(reader.remaining(), "foo bar"); @@ -218,7 +218,7 @@ fn read_quoted_string_with_immediate_remaining() { #[test] fn read_quoted_string_no_open() { - let mut reader = StringReader::from("hello world\"".to_string()); + let mut reader = StringReader::from("hello world\"".to_owned()); let result = reader.read_quoted_string(); assert!(result.is_err()); if let Err(e) = result { @@ -229,7 +229,7 @@ fn read_quoted_string_no_open() { #[test] fn read_quoted_string_no_close() { - let mut reader = StringReader::from("\"hello world".to_string()); + let mut reader = StringReader::from("\"hello world".to_owned()); let result = reader.read_quoted_string(); assert!(result.is_err()); if let Err(e) = result { @@ -240,7 +240,7 @@ fn read_quoted_string_no_close() { #[test] fn read_quoted_string_invalid_escape() { - let mut reader = StringReader::from("\"hello\\nworld\"".to_string()); + let mut reader = StringReader::from("\"hello\\nworld\"".to_owned()); let result = reader.read_quoted_string(); assert!(result.is_err()); if let Err(e) = result { @@ -254,7 +254,7 @@ fn read_quoted_string_invalid_escape() { #[test] fn read_quoted_string_invalid_quote_escape() { - let mut reader = StringReader::from("'hello\\\"\'world".to_string()); + let mut reader = StringReader::from("'hello\\\"\'world".to_owned()); let result = reader.read_quoted_string(); assert!(result.is_err()); if let Err(e) = result { @@ -268,7 +268,7 @@ fn read_quoted_string_invalid_quote_escape() { #[test] fn read_string_no_quotes() { - let mut reader = StringReader::from("hello world".to_string()); + let mut reader = StringReader::from("hello world".to_owned()); assert_eq!(reader.read_string().unwrap(), "hello"); assert_eq!(reader.get_read(), "hello"); assert_eq!(reader.remaining(), " world"); @@ -276,7 +276,7 @@ fn read_string_no_quotes() { #[test] fn read_string_single_quotes() { - let mut reader = StringReader::from("'hello world'".to_string()); + let mut reader = StringReader::from("'hello world'".to_owned()); assert_eq!(reader.read_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "'hello world'"); assert_eq!(reader.remaining(), ""); @@ -284,7 +284,7 @@ fn read_string_single_quotes() { #[test] fn read_string_double_quotes() { - let mut reader = StringReader::from("\"hello world\"".to_string()); + let mut reader = StringReader::from("\"hello world\"".to_owned()); assert_eq!(reader.read_string().unwrap(), "hello world"); assert_eq!(reader.get_read(), "\"hello world\""); assert_eq!(reader.remaining(), ""); @@ -292,7 +292,7 @@ fn read_string_double_quotes() { #[test] fn read_int() { - let mut reader = StringReader::from("1234567890".to_string()); + let mut reader = StringReader::from("1234567890".to_owned()); assert_eq!(reader.read_int().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), ""); @@ -300,7 +300,7 @@ fn read_int() { #[test] fn read_int_negative() { - let mut reader = StringReader::from("-1234567890".to_string()); + let mut reader = StringReader::from("-1234567890".to_owned()); assert_eq!(reader.read_int().unwrap(), -1234567890); assert_eq!(reader.get_read(), "-1234567890"); assert_eq!(reader.remaining(), ""); @@ -308,14 +308,14 @@ fn read_int_negative() { #[test] fn read_int_invalid() { - let mut reader = StringReader::from("12.34".to_string()); + let mut reader = StringReader::from("12.34".to_owned()); let result = reader.read_int(); assert!(result.is_err()); if let Err(e) = result { assert_eq!( e.kind(), &BuiltInError::ReaderInvalidInt { - value: "12.34".to_string() + value: "12.34".to_owned() } ); assert_eq!(e.cursor(), Some(0)); @@ -324,7 +324,7 @@ fn read_int_invalid() { #[test] fn read_int_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.read_int(); assert!(result.is_err()); if let Err(e) = result { @@ -335,7 +335,7 @@ fn read_int_none() { #[test] fn read_int_with_remaining() { - let mut reader = StringReader::from("1234567890 foo bar".to_string()); + let mut reader = StringReader::from("1234567890 foo bar".to_owned()); assert_eq!(reader.read_int().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), " foo bar"); @@ -343,7 +343,7 @@ fn read_int_with_remaining() { #[test] fn read_int_with_remaining_immediate() { - let mut reader = StringReader::from("1234567890foo bar".to_string()); + let mut reader = StringReader::from("1234567890foo bar".to_owned()); assert_eq!(reader.read_int().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), "foo bar"); @@ -351,7 +351,7 @@ fn read_int_with_remaining_immediate() { #[test] fn read_long() { - let mut reader = StringReader::from("1234567890".to_string()); + let mut reader = StringReader::from("1234567890".to_owned()); assert_eq!(reader.read_long().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), ""); @@ -359,7 +359,7 @@ fn read_long() { #[test] fn read_long_negative() { - let mut reader = StringReader::from("-1234567890".to_string()); + let mut reader = StringReader::from("-1234567890".to_owned()); assert_eq!(reader.read_long().unwrap(), -1234567890); assert_eq!(reader.get_read(), "-1234567890"); assert_eq!(reader.remaining(), ""); @@ -367,14 +367,14 @@ fn read_long_negative() { #[test] fn read_long_invalid() { - let mut reader = StringReader::from("12.34".to_string()); + let mut reader = StringReader::from("12.34".to_owned()); let result = reader.read_long(); assert!(result.is_err()); if let Err(e) = result { assert_eq!( e.kind(), &BuiltInError::ReaderInvalidLong { - value: "12.34".to_string() + value: "12.34".to_owned() } ); assert_eq!(e.cursor(), Some(0)); @@ -383,7 +383,7 @@ fn read_long_invalid() { #[test] fn read_long_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.read_long(); assert!(result.is_err()); if let Err(e) = result { @@ -394,7 +394,7 @@ fn read_long_none() { #[test] fn read_long_with_remaining() { - let mut reader = StringReader::from("1234567890 foo bar".to_string()); + let mut reader = StringReader::from("1234567890 foo bar".to_owned()); assert_eq!(reader.read_long().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), " foo bar"); @@ -402,7 +402,7 @@ fn read_long_with_remaining() { #[test] fn read_long_with_remaining_immediate() { - let mut reader = StringReader::from("1234567890foo bar".to_string()); + let mut reader = StringReader::from("1234567890foo bar".to_owned()); assert_eq!(reader.read_long().unwrap(), 1234567890); assert_eq!(reader.get_read(), "1234567890"); assert_eq!(reader.remaining(), "foo bar"); @@ -410,7 +410,7 @@ fn read_long_with_remaining_immediate() { #[test] fn read_double() { - let mut reader = StringReader::from("123".to_string()); + let mut reader = StringReader::from("123".to_owned()); assert_eq!(reader.read_double().unwrap(), 123.0); assert_eq!(reader.get_read(), "123"); assert_eq!(reader.remaining(), ""); @@ -418,7 +418,7 @@ fn read_double() { #[test] fn read_double_with_decimal() { - let mut reader = StringReader::from("12.34".to_string()); + let mut reader = StringReader::from("12.34".to_owned()); assert_eq!(reader.read_double().unwrap(), 12.34); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), ""); @@ -426,7 +426,7 @@ fn read_double_with_decimal() { #[test] fn read_double_negative() { - let mut reader = StringReader::from("-123".to_string()); + let mut reader = StringReader::from("-123".to_owned()); assert_eq!(reader.read_double().unwrap(), -123.0); assert_eq!(reader.get_read(), "-123"); assert_eq!(reader.remaining(), ""); @@ -434,14 +434,14 @@ fn read_double_negative() { #[test] fn read_double_invalid() { - let mut reader = StringReader::from("12.34.56".to_string()); + let mut reader = StringReader::from("12.34.56".to_owned()); let result = reader.read_double(); assert!(result.is_err()); if let Err(e) = result { assert_eq!( e.kind(), &BuiltInError::ReaderInvalidDouble { - value: "12.34.56".to_string() + value: "12.34.56".to_owned() } ); assert_eq!(e.cursor(), Some(0)); @@ -450,7 +450,7 @@ fn read_double_invalid() { #[test] fn read_double_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.read_double(); assert!(result.is_err()); if let Err(e) = result { @@ -461,7 +461,7 @@ fn read_double_none() { #[test] fn read_double_with_remaining() { - let mut reader = StringReader::from("12.34 foo bar".to_string()); + let mut reader = StringReader::from("12.34 foo bar".to_owned()); assert_eq!(reader.read_double().unwrap(), 12.34); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), " foo bar"); @@ -469,7 +469,7 @@ fn read_double_with_remaining() { #[test] fn read_double_with_remaining_immediate() { - let mut reader = StringReader::from("12.34foo bar".to_string()); + let mut reader = StringReader::from("12.34foo bar".to_owned()); assert_eq!(reader.read_double().unwrap(), 12.34); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), "foo bar"); @@ -477,7 +477,7 @@ fn read_double_with_remaining_immediate() { #[test] fn read_float() { - let mut reader = StringReader::from("123".to_string()); + let mut reader = StringReader::from("123".to_owned()); assert_eq!(reader.read_float().unwrap(), 123.0f32); assert_eq!(reader.get_read(), "123"); assert_eq!(reader.remaining(), ""); @@ -485,7 +485,7 @@ fn read_float() { #[test] fn read_float_with_decimal() { - let mut reader = StringReader::from("12.34".to_string()); + let mut reader = StringReader::from("12.34".to_owned()); assert_eq!(reader.read_float().unwrap(), 12.34f32); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), ""); @@ -493,7 +493,7 @@ fn read_float_with_decimal() { #[test] fn read_float_negative() { - let mut reader = StringReader::from("-123".to_string()); + let mut reader = StringReader::from("-123".to_owned()); assert_eq!(reader.read_float().unwrap(), -123.0f32); assert_eq!(reader.get_read(), "-123"); assert_eq!(reader.remaining(), ""); @@ -501,14 +501,14 @@ fn read_float_negative() { #[test] fn read_float_invalid() { - let mut reader = StringReader::from("12.34.56".to_string()); + let mut reader = StringReader::from("12.34.56".to_owned()); let result = reader.read_float(); assert!(result.is_err()); if let Err(e) = result { assert_eq!( e.kind(), &BuiltInError::ReaderInvalidFloat { - value: "12.34.56".to_string() + value: "12.34.56".to_owned() } ); assert_eq!(e.cursor(), Some(0)); @@ -517,7 +517,7 @@ fn read_float_invalid() { #[test] fn read_float_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.read_float(); assert!(result.is_err()); if let Err(e) = result { @@ -528,7 +528,7 @@ fn read_float_none() { #[test] fn read_float_with_remaining() { - let mut reader = StringReader::from("12.34 foo bar".to_string()); + let mut reader = StringReader::from("12.34 foo bar".to_owned()); assert_eq!(reader.read_float().unwrap(), 12.34f32); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), " foo bar"); @@ -536,7 +536,7 @@ fn read_float_with_remaining() { #[test] fn read_float_with_remaining_immediate() { - let mut reader = StringReader::from("12.34foo bar".to_string()); + let mut reader = StringReader::from("12.34foo bar".to_owned()); assert_eq!(reader.read_float().unwrap(), 12.34f32); assert_eq!(reader.get_read(), "12.34"); assert_eq!(reader.remaining(), "foo bar"); @@ -544,14 +544,14 @@ fn read_float_with_remaining_immediate() { #[test] fn expect_correct() { - let mut reader = StringReader::from("abc".to_string()); + let mut reader = StringReader::from("abc".to_owned()); reader.expect('a').unwrap(); assert_eq!(reader.cursor(), 1); } #[test] fn expect_incorrect() { - let mut reader = StringReader::from("bcd".to_string()); + let mut reader = StringReader::from("bcd".to_owned()); let result = reader.expect('a'); assert!(result.is_err()); if let Err(e) = result { @@ -565,7 +565,7 @@ fn expect_incorrect() { #[test] fn expect_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.expect('a'); assert!(result.is_err()); if let Err(e) = result { @@ -579,21 +579,21 @@ fn expect_none() { #[test] fn read_boolean_correct() { - let mut reader = StringReader::from("true".to_string()); + let mut reader = StringReader::from("true".to_owned()); assert!(reader.read_boolean().unwrap()); assert_eq!(reader.get_read(), "true"); } #[test] fn read_boolean_incorrect() { - let mut reader = StringReader::from("tuesday".to_string()); + let mut reader = StringReader::from("tuesday".to_owned()); let result = reader.read_boolean(); assert!(result.is_err()); if let Err(e) = result { assert_eq!( e.kind(), &BuiltInError::ReaderInvalidBool { - value: "tuesday".to_string() + value: "tuesday".to_owned() } ); assert_eq!(e.cursor(), Some(0)); @@ -602,7 +602,7 @@ fn read_boolean_incorrect() { #[test] fn read_boolean_none() { - let mut reader = StringReader::from("".to_string()); + let mut reader = StringReader::from("".to_owned()); let result = reader.read_boolean(); assert!(result.is_err()); if let Err(e) = result { diff --git a/azalea-brigadier/tests/suggestion/suggestions_builder_test.rs b/azalea-brigadier/tests/suggestion/suggestions_builder_test.rs index 08ce65d4..000ac7a0 100644 --- a/azalea-brigadier/tests/suggestion/suggestions_builder_test.rs +++ b/azalea-brigadier/tests/suggestion/suggestions_builder_test.rs @@ -127,7 +127,7 @@ fn sort_mixed() { "11", "2", "22", "33", "3a", "4", "6", "8", "30", "32", "a", "a3", "b", "c", ] .into_iter() - .map(|s| s.to_string()) + .map(|s| s.to_owned()) .collect::<HashSet<_>>(); assert_eq!(actual, expected); } |
