diff --git a/crates/cli/src/tests/query_test.rs b/crates/cli/src/tests/query_test.rs index 7c436ede..f75706a4 100644 --- a/crates/cli/src/tests/query_test.rs +++ b/crates/cli/src/tests/query_test.rs @@ -821,8 +821,7 @@ fn test_query_matches_with_many_overlapping_results() { // .foo(bar(BAZ)) // .foo(bar(BAZ)) // ... - let mut source = "a".to_string(); - source += &"\n .foo(bar(BAZ))".repeat(count); + let source = format!("a{}", "\n .foo(bar(BAZ))".repeat(count)); assert_query_matches( &language, diff --git a/crates/generate/src/build_tables/build_parse_table.rs b/crates/generate/src/build_tables/build_parse_table.rs index e81322b0..9c340db7 100644 --- a/crates/generate/src/build_tables/build_parse_table.rs +++ b/crates/generate/src/build_tables/build_parse_table.rs @@ -855,9 +855,9 @@ impl<'a> ParseTableBuilder<'a> { for symbol in preceding_symbols { conflict_error .symbol_sequence - .push(self.symbol_name(symbol).to_string()); + .push(self.symbol_name(symbol)); } - conflict_error.conflicting_lookahead = self.symbol_name(&conflicting_lookahead).to_string(); + conflict_error.conflicting_lookahead = self.symbol_name(&conflicting_lookahead); let interpretations = conflicting_items .iter() @@ -865,7 +865,7 @@ impl<'a> ParseTableBuilder<'a> { let preceding_symbols = preceding_symbols .iter() .take(preceding_symbols.len() - item.step_index as usize) - .map(|symbol| self.symbol_name(symbol).to_string()) + .map(|symbol| self.symbol_name(symbol)) .collect::>(); let variable_name = self.syntax_grammar.variables[item.variable_index as usize] @@ -876,7 +876,7 @@ impl<'a> ParseTableBuilder<'a> { .production .steps .iter() - .map(|step| self.symbol_name(&step.symbol).to_string()) + .map(|step| self.symbol_name(&step.symbol)) .collect::>(); let precedence = match item.precedence() { @@ -892,7 +892,7 @@ impl<'a> ParseTableBuilder<'a> { production_step_symbols, step_index: item.step_index, done: item.is_done(), - conflicting_lookahead: self.symbol_name(&conflicting_lookahead).to_string(), + conflicting_lookahead: self.symbol_name(&conflicting_lookahead), precedence, associativity, }