From 12e7626c9fd8c1c1699bc0043b6524704dc6be82 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 24 Dec 2019 22:08:22 +0000 Subject: Ensure normalization respects var names on the nose --- dhall/src/tests.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'dhall/src/tests.rs') diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs index 0163c4d..f1648cf 100644 --- a/dhall/src/tests.rs +++ b/dhall/src/tests.rs @@ -206,11 +206,9 @@ pub fn run_test(test: Test<'_>) -> Result<()> { let expr = parse_file_str(&expr_file_path)? .resolve()? .typecheck()? - .normalize(); - let expected = parse_file_str(&expected_file_path)? - .resolve()? - .typecheck()? - .normalize(); + .normalize() + .to_expr(); + let expected = parse_file_str(&expected_file_path)?.to_expr(); assert_eq_display!(expr, expected); } @@ -220,12 +218,9 @@ pub fn run_test(test: Test<'_>) -> Result<()> { .typecheck()? .normalize() .to_expr_alpha(); - let expected = parse_file_str(&expected_file_path)? - .resolve()? - .typecheck()? - .normalize(); + let expected = parse_file_str(&expected_file_path)?.to_expr(); - assert_eq_display!(expr, expected.to_expr()); + assert_eq_display!(expr, expected); } } Ok(()) -- cgit v1.2.3