diff options
| author | bors <bors@rust-lang.org> | 2021-12-20 04:21:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-20 04:21:12 +0000 |
| commit | 940a97a91023d1817b33d0ababc985793c9ed780 (patch) | |
| tree | 6b1d8e84ebd946c786e6656ce26e60a27a86ad6f /src/test/rustdoc | |
| parent | ed7a2068432b62880bca89cd69546682a2e192cd (diff) | |
| parent | 02b94b7922d6938da3bde07cedd5f02823a72d97 (diff) | |
| download | rust-940a97a91023d1817b33d0ababc985793c9ed780.tar.gz rust-940a97a91023d1817b33d0ababc985793c9ed780.zip | |
Auto merge of #91900 - pitaj:fix-91714, r=jyn514
rustdoc: make `--passes` and `--no-defaults` have no effect Fixes #91714 One potential issue is that currently there is no stable way to achieve `--document-hidden-items`. This affects test `issue-15347`. I also had to modify the tests `issue-42875` and `no-compiler-export`. Regardless of combinations of `--document-hidden-items` and `--document-private-items`, I was unable to get these to pass without the modifications. I left behind a comment noting the change.
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/inline_local/glob-extern-document-private-items.rs (renamed from src/test/rustdoc/inline_local/glob-extern-no-defaults.rs) | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/inline_local/glob-private-document-private-items.rs (renamed from src/test/rustdoc/inline_local/glob-private-no-defaults.rs) | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-15347.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-42875.rs | 13 | ||||
| -rw-r--r-- | src/test/rustdoc/no-compiler-reexport.rs | 6 |
5 files changed, 6 insertions, 19 deletions
diff --git a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs b/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs index 55c75dfe27b..a2f0d65efce 100644 --- a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs +++ b/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs @@ -1,4 +1,4 @@ -// compile-flags: --no-defaults +// compile-flags: --document-private-items #![crate_name = "foo"] diff --git a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs b/src/test/rustdoc/inline_local/glob-private-document-private-items.rs index ac854ac4320..f16d21ecdb1 100644 --- a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs +++ b/src/test/rustdoc/inline_local/glob-private-document-private-items.rs @@ -1,4 +1,4 @@ -// compile-flags: --no-defaults +// compile-flags: --document-private-items #![crate_name = "foo"] diff --git a/src/test/rustdoc/issue-15347.rs b/src/test/rustdoc/issue-15347.rs index fa67da840b7..e93d7401168 100644 --- a/src/test/rustdoc/issue-15347.rs +++ b/src/test/rustdoc/issue-15347.rs @@ -1,4 +1,4 @@ -// compile-flags: --no-defaults --passes collapse-docs --passes unindent-comments +// compile-flags: -Z unstable-options --document-hidden-items // @has issue_15347/fn.foo.html #[doc(hidden)] diff --git a/src/test/rustdoc/issue-42875.rs b/src/test/rustdoc/issue-42875.rs deleted file mode 100644 index 292c2077688..00000000000 --- a/src/test/rustdoc/issue-42875.rs +++ /dev/null @@ -1,13 +0,0 @@ -// compile-flags: --no-defaults - -#![crate_name = "foo"] - -// @has foo/a/index.html '//code' 'use *;' -mod a { - use *; -} - -// @has foo/b/index.html '//code' 'pub use *;' -pub mod b { - pub use *; -} diff --git a/src/test/rustdoc/no-compiler-reexport.rs b/src/test/rustdoc/no-compiler-reexport.rs index 6d50325fed5..d28fdf87b77 100644 --- a/src/test/rustdoc/no-compiler-reexport.rs +++ b/src/test/rustdoc/no-compiler-reexport.rs @@ -1,7 +1,7 @@ -// compile-flags: --no-defaults +// compile-flags: -Z unstable-options --document-hidden-items --document-private-items #![crate_name = "foo"] -// @has 'foo/index.html' '//code' 'extern crate std;' -// @!has 'foo/index.html' '//code' 'use std::prelude::v1::*;' +// @!has 'foo/index.html' '//code' 'extern crate std;' +// @!has 'foo/index.html' '//code' 'use std::prelude' pub struct Foo; |
