Merge pull request RustPython#769 from RustPython/coolreader18/lalrpop-process-out_dir

windelbouwman · web-flow · commit f1a60e1ce500 · 2019-03-31T10:57:31.000+02:00
Process lalrpop in cargo's target directory
diff --git a/parser/.gitignore b/parser/.gitignore
diff --git a/parser/build.rs b/parser/build.rs
@@ -1,8 +1,5 @@
 use lalrpop;
 
 fn main() {
-    lalrpop::Configuration::new()
-        .generate_in_source_tree()
-        .process()
-        .unwrap();
+    lalrpop::process_root().unwrap()
 }
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
@@ -1,11 +1,14 @@
 #[macro_use]
 extern crate log;
+use lalrpop_util::lalrpop_mod;
 
 pub mod ast;
 pub mod error;
 mod fstring;
 pub mod lexer;
 pub mod parser;
-#[cfg_attr(rustfmt, rustfmt_skip)]
-mod python;
+lalrpop_mod!(
+    #[allow(clippy::all)]
+    python
+);
 pub mod token;
diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -2,7 +2,6 @@
 // See also: https://github.com/antlr/grammars-v4/blob/master/python3/Python3.g4
 // See also: file:///usr/share/doc/python/html/reference/compound_stmts.html#function-definitions
 // See also: https://greentreesnakes.readthedocs.io/en/latest/nodes.html#keyword
-#![allow(unknown_lints,clippy)]
 
 use std::iter::FromIterator;
 
