diff options
| author | bors <bors@rust-lang.org> | 2019-11-27 00:32:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-27 00:32:30 +0000 |
| commit | 809e180a76ce97340bf4354ff357bc59e3ca40b2 (patch) | |
| tree | 7c8e0aaf9f4345352e07818cb99d9b99d78ad81e /src/test/rustdoc-ui | |
| parent | a7d791b4503a86c1b16b4393ba7998ef8b561a27 (diff) | |
| parent | 8547ea32db4a6f2c5b27827b30f372859de22fbb (diff) | |
| download | rust-809e180a76ce97340bf4354ff357bc59e3ca40b2.tar.gz rust-809e180a76ce97340bf4354ff357bc59e3ca40b2.zip | |
Auto merge of #66794 - tmandry:rollup-99qrpr0, r=tmandry
Rollup of 14 pull requests Successful merges: - #66128 (alloc: Add new_zeroed() versions like new_uninit().) - #66661 (Add riscv64gc-unknown-linux-gnu target) - #66663 (Miri: print leak report even without tracing) - #66711 (Add hardware floating point features to aarch64-pc-windows-msvc) - #66713 (introduce a target to build the kernel of the unikernel HermitCore) - #66717 (tidy: Accommodate rustfmt's preferred layout of stability attributes) - #66719 (Store pointer width as u32 on Config) - #66720 (Move ErrorReported to rustc_errors) - #66737 (Error codes cleanup) - #66754 (Various tweaks to diagnostic output) - #66763 (Minor edit for documentation-tests.md that increases clarity) - #66779 (follow the same function order in the trait) - #66786 (Add wildcard test for const_if_match) - #66788 (Allow `Unreachable` terminators through `min_const_fn` checks) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc-ui')
| -rw-r--r-- | src/test/rustdoc-ui/doc-without-codeblock.rs | 8 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/doc-without-codeblock.stderr | 8 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/lint-group.rs | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/lint-group.stderr | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/lint-missing-doc-code-example.stderr | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/private-item-doc-test.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/private-item-doc-test.stderr | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.rs b/src/test/rustdoc-ui/doc-without-codeblock.rs index 4b2a91e9c81..5ad8e8a826f 100644 --- a/src/test/rustdoc-ui/doc-without-codeblock.rs +++ b/src/test/rustdoc-ui/doc-without-codeblock.rs @@ -1,13 +1,13 @@ -#![deny(missing_doc_code_examples)] //~ ERROR Missing code example in this documentation +#![deny(missing_doc_code_examples)] //~ ERROR missing code example in this documentation /// Some docs. -//~^ ERROR Missing code example in this documentation +//~^ ERROR missing code example in this documentation pub struct Foo; /// And then, the princess died. -//~^ ERROR Missing code example in this documentation +//~^ ERROR missing code example in this documentation pub mod foo { /// Or maybe not because she saved herself! - //~^ ERROR Missing code example in this documentation + //~^ 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 23c07c4d32d..bf65fcf19a0 100644 --- a/src/test/rustdoc-ui/doc-without-codeblock.stderr +++ b/src/test/rustdoc-ui/doc-without-codeblock.stderr @@ -1,4 +1,4 @@ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/doc-without-codeblock.rs:1:1 | LL | / #![deny(missing_doc_code_examples)] @@ -16,19 +16,19 @@ note: lint level defined here LL | #![deny(missing_doc_code_examples)] | ^^^^^^^^^^^^^^^^^^^^^^^^^ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/doc-without-codeblock.rs:3:1 | LL | /// Some docs. | ^^^^^^^^^^^^^^ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/doc-without-codeblock.rs:7:1 | LL | /// And then, the princess died. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/doc-without-codeblock.rs:10:5 | LL | /// Or maybe not because she saved herself! diff --git a/src/test/rustdoc-ui/lint-group.rs b/src/test/rustdoc-ui/lint-group.rs index 0e0ebd9ce70..06766db5335 100644 --- a/src/test/rustdoc-ui/lint-group.rs +++ b/src/test/rustdoc-ui/lint-group.rs @@ -14,11 +14,11 @@ pub fn link_error() {} //~^^^^^ ERROR cannot be resolved, ignoring it /// wait, this doesn't have a doctest? -pub fn no_doctest() {} //~^ ERROR Missing code example in this documentation +pub fn no_doctest() {} //~^ ERROR missing code example in this documentation /// wait, this *does* have a doctest? /// /// ``` /// println!("sup"); /// ``` -fn private_doctest() {} //~^^^^^ ERROR Documentation test in private item +fn private_doctest() {} //~^^^^^ ERROR documentation test in private item diff --git a/src/test/rustdoc-ui/lint-group.stderr b/src/test/rustdoc-ui/lint-group.stderr index cd523b227de..63274ae2be4 100644 --- a/src/test/rustdoc-ui/lint-group.stderr +++ b/src/test/rustdoc-ui/lint-group.stderr @@ -1,4 +1,4 @@ -error: Documentation test in private item +error: documentation test in private item --> $DIR/lint-group.rs:19:1 | LL | / /// wait, this *does* have a doctest? @@ -29,7 +29,7 @@ LL | #![deny(rustdoc)] = note: `#[deny(intra_doc_link_resolution_failure)]` implied by `#[deny(rustdoc)]` = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]` -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/lint-group.rs:16:1 | LL | /// wait, this doesn't have a doctest? diff --git a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr b/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr index 97a52a13e3f..179dba17c6d 100644 --- a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr +++ b/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr @@ -1,4 +1,4 @@ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/lint-missing-doc-code-example.rs:19:1 | LL | / mod module1 { @@ -11,7 +11,7 @@ note: lint level defined here LL | #![deny(missing_doc_code_examples)] | ^^^^^^^^^^^^^^^^^^^^^^^^^ -error: Missing code example in this documentation +error: missing code example in this documentation --> $DIR/lint-missing-doc-code-example.rs:37:3 | LL | /// doc diff --git a/src/test/rustdoc-ui/private-item-doc-test.rs b/src/test/rustdoc-ui/private-item-doc-test.rs index 20ac292aeaf..2f1bddc7c75 100644 --- a/src/test/rustdoc-ui/private-item-doc-test.rs +++ b/src/test/rustdoc-ui/private-item-doc-test.rs @@ -6,6 +6,6 @@ mod foo { /// ``` /// assert!(false); /// ``` - //~^^^^^ ERROR Documentation test in private item + //~^^^^^ ERROR documentation test in private item fn bar() {} } diff --git a/src/test/rustdoc-ui/private-item-doc-test.stderr b/src/test/rustdoc-ui/private-item-doc-test.stderr index 20f3eb8b120..8abbdb31ec9 100644 --- a/src/test/rustdoc-ui/private-item-doc-test.stderr +++ b/src/test/rustdoc-ui/private-item-doc-test.stderr @@ -1,4 +1,4 @@ -error: Documentation test in private item +error: documentation test in private item --> $DIR/private-item-doc-test.rs:4:5 | LL | / /// private doc test |
