Update for review comments.

Author: ehuss

src/cargo/core/compiler/mod.rs

@@ -283,7 +283,7 @@ fn rustc<'a, 'cfg>(
                 &package_id,
                 &target,
                 mode,
-                &mut json_stdout,
+                &mut assert_is_empty,
                 &mut |line| json_stderr(line, &package_id, &target),
             ).map_err(Internal::new)
             .chain_err(|| format!("Could not compile `{}`.", name))?;
@@ -640,7 +640,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
         let exec_result = if json_messages {
             rustdoc
                 .exec_with_streaming(
-                    &mut json_stdout,
+                    &mut assert_is_empty,
                     &mut |line| json_stderr(line, &package_id, &target),
                     false,
                 ).map(drop)
@@ -988,7 +988,7 @@ impl Kind {
     }
 }
 
-fn json_stdout(line: &str) -> CargoResult<()> {
+fn assert_is_empty(line: &str) -> CargoResult<()> {
     if !line.is_empty() {
         Err(internal(&format!(
             "compiler stdout is not empty: `{}`",

tests/testsuite/doc.rs

@@ -1359,22 +1359,22 @@ fn doc_private_items() {
     assert_that(&foo.root().join("target/doc/foo/private/index.html"), existing_file());
 }
 
+const BAD_INTRA_LINK_LIB: &'static str = r#"
+#![deny(intra_doc_link_resolution_failure)]
+
+/// [bad_link]
+pub fn foo() {}
+"#;
+
 #[test]
 fn doc_cap_lints() {
     if !is_nightly() {
         // This can be removed once 1.29 is stable (rustdoc --cap-lints).
         return;
     }
     let a = git::new("a", |p| {
-        p.file("Cargo.toml", &basic_lib_manifest("a")).file(
-            "src/lib.rs",
-            "
-            #![deny(intra_doc_link_resolution_failure)]
-
-            /// [bad_link]
-            pub fn foo() {}
-        ",
-        )
+        p.file("Cargo.toml", &basic_lib_manifest("a"))
+            .file("src/lib.rs", BAD_INTRA_LINK_LIB)
     }).unwrap();
 
     let p = project()
@@ -1419,7 +1419,6 @@ fn doc_cap_lints() {
 ",
         ),
     );
-
 }
 
 #[test]
@@ -1428,16 +1427,16 @@ fn doc_message_format() {
         // This can be removed once 1.30 is stable (rustdoc --error-format stabilized).
         return;
     }
-    let p = project().file("src/lib.rs", "asdf").build();
+    let p = project().file("src/lib.rs", BAD_INTRA_LINK_LIB).build();
 
     assert_that(
         p.cargo("doc --message-format=json"),
         execs().with_status(101).with_json(
             r#"
             {
                 "message": {
-                    "children": [],
-                    "code": null,
+                    "children": "{...}",
+                    "code": "{...}",
                     "level": "error",
                     "message": "[..]",
                     "rendered": "[..]",