about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-11-30 16:20:07 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2018-12-04 10:06:05 +0100
commitff97569dd9c55ef8a89e9201a03ed41a482e030c (patch)
tree38ae84f09e96e64b5025e6891a4ef3a37a188503
parent690439bb45e27f0fb76c05dcd8b5ae9adfc86c55 (diff)
downloadrust-ff97569dd9c55ef8a89e9201a03ed41a482e030c.tar.gz
rust-ff97569dd9c55ef8a89e9201a03ed41a482e030c.zip
Update doc-ui tests
-rw-r--r--src/test/rustdoc-ui/doc-without-codeblock.rs4
-rw-r--r--src/test/rustdoc-ui/doc-without-codeblock.stderr8
-rw-r--r--src/test/rustdoc-ui/intra-link-span-ice-55723.rs3
-rw-r--r--src/test/rustdoc-ui/private-item-doc-test.rs1
4 files changed, 11 insertions, 5 deletions
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.rs b/src/test/rustdoc-ui/doc-without-codeblock.rs
index e047b272c41..645deff334b 100644
--- a/src/test/rustdoc-ui/doc-without-codeblock.rs
+++ b/src/test/rustdoc-ui/doc-without-codeblock.rs
@@ -1,3 +1,4 @@
+//~ ERROR Missing code example in this documentation
 // Copyright 2018 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
@@ -11,10 +12,13 @@
 #![deny(missing_doc_code_examples)]
 
 /// Some docs.
+//~^ ERROR Missing code example in this documentation
 pub struct Foo;
 
 /// And then, the princess died.
+//~^ ERROR Missing code example in this documentation
 pub mod foo {
     /// Or maybe not because she saved herself!
+    //~^ ERROR Missing code example in this documentation
     pub fn bar() {}
 }
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.stderr b/src/test/rustdoc-ui/doc-without-codeblock.stderr
index ba5bb7fc0b1..f3efc654050 100644
--- a/src/test/rustdoc-ui/doc-without-codeblock.stderr
+++ b/src/test/rustdoc-ui/doc-without-codeblock.stderr
@@ -1,25 +1,25 @@
 error: Missing code example in this documentation
    |
 note: lint level defined here
-  --> $DIR/doc-without-codeblock.rs:11:9
+  --> $DIR/doc-without-codeblock.rs:12:9
    |
 LL | #![deny(missing_doc_code_examples)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: Missing code example in this documentation
-  --> $DIR/doc-without-codeblock.rs:13:1
+  --> $DIR/doc-without-codeblock.rs:14:1
    |
 LL | /// Some docs.
    | ^^^^^^^^^^^^^^
 
 error: Missing code example in this documentation
-  --> $DIR/doc-without-codeblock.rs:16:1
+  --> $DIR/doc-without-codeblock.rs:18:1
    |
 LL | /// And then, the princess died.
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: Missing code example in this documentation
-  --> $DIR/doc-without-codeblock.rs:18:5
+  --> $DIR/doc-without-codeblock.rs:21:5
    |
 LL |     /// Or maybe not because she saved herself!
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/rustdoc-ui/intra-link-span-ice-55723.rs b/src/test/rustdoc-ui/intra-link-span-ice-55723.rs
index 12e59a4813f..c701548faaa 100644
--- a/src/test/rustdoc-ui/intra-link-span-ice-55723.rs
+++ b/src/test/rustdoc-ui/intra-link-span-ice-55723.rs
@@ -17,8 +17,9 @@
 // https://github.com/rust-lang/rust/issues/55723
 
 /// ## For example:
-///  
+///
 /// (arr[i])
+//~^ ERROR `[i]` cannot be resolved, ignoring it...
 pub fn test_ice() {
     unimplemented!();
 }
diff --git a/src/test/rustdoc-ui/private-item-doc-test.rs b/src/test/rustdoc-ui/private-item-doc-test.rs
index 5a13fe359f5..771dc3bd351 100644
--- a/src/test/rustdoc-ui/private-item-doc-test.rs
+++ b/src/test/rustdoc-ui/private-item-doc-test.rs
@@ -16,5 +16,6 @@ mod foo {
     /// ```
     /// assert!(false);
     /// ```
+    //~^^^^^ ERROR Documentation test in private item
     fn bar() {}
 }