From b43bcd43c604126c2b250a30cc56459be754572a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 16 Oct 2018 20:53:19 +0300 Subject: fix tests --- crates/tools/src/lib.rs | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'crates/tools/src/lib.rs') diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index 63ede5315..444745be5 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs @@ -1,13 +1,15 @@ extern crate itertools; -#[macro_use] extern crate failure; +extern crate teraron; -use itertools::Itertools; use std::{ - fs, path::{Path, PathBuf}, }; +use itertools::Itertools; + +pub use teraron::{Mode, Verify, Overwrite}; + pub type Result = ::std::result::Result; pub const GRAMMAR: &str = "ra_syntax/src/grammar.ron"; @@ -54,22 +56,23 @@ pub fn collect_tests(s: &str) -> Vec<(usize, Test)> { res } -pub fn update(path: &Path, contents: &str, verify: bool) -> Result<()> { - match fs::read_to_string(path) { - Ok(ref old_contents) if old_contents == contents => { - return Ok(()); - } - _ => (), - } - if verify { - bail!("`{}` is not up-to-date", path.display()); - } - eprintln!("updating {}", path.display()); - fs::write(path, contents)?; +pub fn generate(mode: Mode) -> Result<()> { + let grammar = project_root().join(GRAMMAR); + let syntax_kinds = project_root().join(SYNTAX_KINDS); + let ast = project_root().join(AST); + teraron::generate( + &syntax_kinds, + &grammar, + mode, + )?; + teraron::generate( + &ast, + &grammar, + mode, + )?; Ok(()) } - pub fn project_root() -> PathBuf { Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()) .parent() -- cgit v1.2.3