From 3d11388cd10d2e69191a6e255e47afce16eeab69 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 17 Jan 2019 12:40:21 -0800 Subject: [PATCH] Fix test subcommand bugs * Log session was dropped before the parser * Whitespace between close parens was not stripped --- cli/src/test.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/test.rs b/cli/src/test.rs index 4d6034e5..3a40eb83 100644 --- a/cli/src/test.rs +++ b/cli/src/test.rs @@ -44,12 +44,12 @@ pub fn run_tests_at_path( filter: Option<&str>, ) -> Result<()> { let test_entry = parse_tests(path)?; - let mut log_session = None; + let mut _log_session = None; let mut parser = Parser::new(); parser.set_language(language)?; if debug_graph { - log_session = Some(util::log_graphs(&mut parser, "log.html")?); + _log_session = Some(util::log_graphs(&mut parser, "log.html")?); } else if debug { parser.set_logger(Some(Box::new(|log_type, message| { if log_type == LogType::Lex { @@ -82,7 +82,6 @@ pub fn run_tests_at_path( } } - drop(log_session); Ok(()) } @@ -200,6 +199,7 @@ fn parse_test_content(name: String, content: String) -> TestEntry { if let Ok(output) = str::from_utf8(&bytes[divider_end..header_start]) { let input = bytes[previous_header_end..divider_start].to_vec(); let output = WHITESPACE_REGEX.replace_all(output.trim(), " ").to_string(); + let output = output.replace(" )", ")"); children.push(TestEntry::Example { name: previous_name, input,