Merge pull request lalrpop#585 from devsnek/fix-no-std

fix more no-std items
sigmacomputing · Jan 28, 2021 · a8afe7d · a8afe7d
2 parents 97957b5 + 49bd3dc
commit a8afe7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lalrpop/src/lr1/codegen/parse_table.rs b/lalrpop/src/lr1/codegen/parse_table.rs
@@ -300,7 +300,7 @@ impl<'ascent, 'grammar, W: Write> CodeGenerator<'ascent, 'grammar, W, TableDrive
         rust!(self.out, "");
         rust!(
             self.out,
-            "fn expected_tokens(&self, state: {state_type}) -> Vec<String> {{",
+            "fn expected_tokens(&self, state: {state_type}) -> alloc::vec::Vec<alloc::string::String> {{",
             state_type = state_type,
         );
         rust!(self.out, "{p}expected_tokens(state)", p = self.prefix);
@@ -346,12 +346,12 @@ impl<'ascent, 'grammar, W: Write> CodeGenerator<'ascent, 'grammar, W, TableDrive
         rust!(self.out, "start_location: Option<&Self::Location>,");
         rust!(
             self.out,
-            "states: &mut Vec<{state_type}>,",
+            "states: &mut alloc::vec::Vec<{state_type}>,",
             state_type = state_type
         );
         rust!(
             self.out,
-            "symbols: &mut Vec<{p}state_machine::SymbolTriple<Self>>,",
+            "symbols: &mut alloc::vec::Vec<{p}state_machine::SymbolTriple<Self>>,",
             p = self.prefix,
         );
         rust!(
@@ -1553,7 +1553,7 @@ impl<'ascent, 'grammar, W: Write> CodeGenerator<'ascent, 'grammar, W, TableDrive
         rust!(self.out, "if next_state == 0 {{");
         rust!(self.out, "None");
         rust!(self.out, "}} else {{");
-        rust!(self.out, "Some(terminal.to_string())");
+        rust!(self.out, "Some(alloc::string::ToString::to_string(terminal))");
         rust!(self.out, "}}");
         rust!(self.out, "}}).collect()");
         rust!(self.out, "}}");

diff --git a/lalrpop/src/normalize/macro_expand/mod.rs b/lalrpop/src/normalize/macro_expand/mod.rs
@@ -471,7 +471,7 @@ impl MacroExpander {
                             span,
                             expr: ExprSymbol { symbols: vec![] },
                             condition: None,
-                            action: action("vec![]"),
+                            action: action("alloc::vec![]"),
                             annotations: vec![],
                         },
                         // X* = <v:X+>
@@ -519,7 +519,7 @@ impl MacroExpander {
                                 symbols: vec![repeat.symbol.clone()],
                             },
                             condition: None,
-                            action: action("vec![<>]"),
+                            action: action("alloc::vec![<>]"),
                             annotations: vec![],
                         },
                         // X+ = <v:X+> <e:X>