commit 3fec393878a7bd2597e7e632e84534dd79a555b8
author Alex Crichton <alex@alexcrichton.com> Thu May 17 12:09:13 2018 -0700
committer David Tolnay <dtolnay@gmail.com> Sun May 20 16:41:41 2018 -0700
tree c91c9e51d61db53172d51b288285a353749194ec
parent f0fea9ac005418de4f46d540424ca7f50a46d1a4

Fix up some final issues

tests/common/mod.rs

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index cc7039c..508389f 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -21,8 +21,13 @@
 pub mod respan;
 
 pub fn check_min_stack() {
-    let min_stack_value = env::var("RUST_MIN_STACK")
-        .expect("RUST_MIN_STACK env var should be set since some tests require it.");
+    let min_stack_value = match env::var("RUST_MIN_STACK") {
+        Ok(s) => s,
+        Err(_) => {
+            env::set_var("RUST_MIN_STACK", 16000000.to_string());
+            return
+        }
+    };
     let min_stack_value: usize = min_stack_value
         .parse()
         .expect("RUST_MIN_STACK env var should be set since some tests require it.");

tests/test_ident.rs

diff --git a/tests/test_ident.rs b/tests/test_ident.rs
index 99596a6..cb0b2f4 100644
--- a/tests/test_ident.rs
+++ b/tests/test_ident.rs
@@ -28,7 +28,7 @@
 
 #[test]
 fn ident_parse_keyword() {
-    parse("abstract").unwrap();
+    parse("abstract").unwrap_err();
 }
 
 #[test]
@@ -43,7 +43,7 @@
 
 #[test]
 fn ident_parse_underscore() {
-    parse("_").unwrap();
+    parse("_").unwrap_err();
 }
 
 #[test]

tests/test_round_trip.rs

diff --git a/tests/test_round_trip.rs b/tests/test_round_trip.rs
index 92e84e5..4659be4 100644
--- a/tests/test_round_trip.rs
+++ b/tests/test_round_trip.rs
@@ -120,10 +120,10 @@
                         true
                     } else {
                         errorf!(
-                            "=== {}: FAIL\nbefore: {}\nafter: {}\n",
+                            "=== {}: FAIL\nbefore: {:#?}\nafter: {:#?}\n",
                             path.display(),
-                            format!("{:?}", before).replace("\n", ""),
-                            format!("{:?}", after).replace("\n", "")
+                            before,
+                            after,
                         );
                         false
                     }