From 0789b2b250d497825fcbe172629b51586de0c4d9 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Fri, 22 Dec 2017 20:38:38 -0500
Subject: [PATCH 1/2] DynTestFn closure now takes zero arguments

---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index ce1a78b..c489aca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -268,7 +268,7 @@ pub fn make_test_name(config: &Config, testpaths: &TestPaths) -> test::TestName
 pub fn make_test_closure(config: &Config, testpaths: &TestPaths) -> test::TestFn {
     let config = config.clone();
     let testpaths = testpaths.clone();
-    test::DynTestFn(Box::new(move |()| {
+    test::DynTestFn(Box::new(move || {
         runtest::run(config, &testpaths)
     }))
 }

From 42086f3aa4cb80eb6fe9c31d43e5113665a00cb6 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Fri, 22 Dec 2017 20:41:14 -0500
Subject: [PATCH 2/2] ignore some doc tests

---
 src/header.rs  | 2 +-
 src/runtest.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/header.rs b/src/header.rs
index c853d53..d57d0c1 100644
--- a/src/header.rs
+++ b/src/header.rs
@@ -622,7 +622,7 @@ fn expand_variables(mut value: String, config: &Config) -> String {
 ///
 /// # Examples
 ///
-/// ```
+/// ```ignore
 /// let mut s = "normalize-stderr-32bit: \"something (32 bits)\" -> \"something ($WORD bits)\".";
 /// let first = parse_normalization_string(&mut s);
 /// assert_eq!(first, Some("something (32 bits)".to_owned()));
diff --git a/src/runtest.rs b/src/runtest.rs
index 1fd4888..7e3ca42 100644
--- a/src/runtest.rs
+++ b/src/runtest.rs
@@ -1603,8 +1603,7 @@ actual:\n\
     }
 
     /// Given a test path like `compile-fail/foo/bar.rs` Returns a name like
-    ///
-    ///     <output>/foo/bar-stage1
+    /// `<output>/foo/bar-stage1`
     fn output_base_name(&self) -> PathBuf {
         let dir = self.config.build_base.join(&self.testpaths.relative_dir);