From 02b94b7922d6938da3bde07cedd5f02823a72d97 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Mon, 13 Dec 2021 23:49:29 -0700 Subject: rustdoc: remove `--passes` and `--no-defaults` - flags no longer function, see #44136 - adjust tests to match new behavior - removed test issue-42875 (covered regression with --no-defaults) - moved input-format to removed flags - move all removed flags to bottom - note flag removal in command help - remove DefaultPassOption enum (now redundant with `show_coverage`) --- .../glob-extern-document-private-items.rs | 25 +++++++++++ .../inline_local/glob-extern-no-defaults.rs | 25 ----------- .../glob-private-document-private-items.rs | 48 ++++++++++++++++++++++ .../inline_local/glob-private-no-defaults.rs | 48 ---------------------- 4 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 src/test/rustdoc/inline_local/glob-extern-document-private-items.rs delete mode 100644 src/test/rustdoc/inline_local/glob-extern-no-defaults.rs create mode 100644 src/test/rustdoc/inline_local/glob-private-document-private-items.rs delete mode 100644 src/test/rustdoc/inline_local/glob-private-no-defaults.rs (limited to 'src/test/rustdoc/inline_local') diff --git a/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs b/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs new file mode 100644 index 00000000000..a2f0d65efce --- /dev/null +++ b/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs @@ -0,0 +1,25 @@ +// compile-flags: --document-private-items + +#![crate_name = "foo"] + +mod mod1 { + extern "C" { + pub fn public_fn(); + fn private_fn(); + } +} + +pub use mod1::*; + +// @has foo/index.html +// @has - "mod1" +// @has - "public_fn" +// @!has - "private_fn" +// @has foo/fn.public_fn.html +// @!has foo/fn.private_fn.html + +// @has foo/mod1/index.html +// @has - "public_fn" +// @has - "private_fn" +// @has foo/mod1/fn.public_fn.html +// @has foo/mod1/fn.private_fn.html diff --git a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs b/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs deleted file mode 100644 index 55c75dfe27b..00000000000 --- a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs +++ /dev/null @@ -1,25 +0,0 @@ -// compile-flags: --no-defaults - -#![crate_name = "foo"] - -mod mod1 { - extern "C" { - pub fn public_fn(); - fn private_fn(); - } -} - -pub use mod1::*; - -// @has foo/index.html -// @has - "mod1" -// @has - "public_fn" -// @!has - "private_fn" -// @has foo/fn.public_fn.html -// @!has foo/fn.private_fn.html - -// @has foo/mod1/index.html -// @has - "public_fn" -// @has - "private_fn" -// @has foo/mod1/fn.public_fn.html -// @has foo/mod1/fn.private_fn.html diff --git a/src/test/rustdoc/inline_local/glob-private-document-private-items.rs b/src/test/rustdoc/inline_local/glob-private-document-private-items.rs new file mode 100644 index 00000000000..f16d21ecdb1 --- /dev/null +++ b/src/test/rustdoc/inline_local/glob-private-document-private-items.rs @@ -0,0 +1,48 @@ +// compile-flags: --document-private-items + +#![crate_name = "foo"] + +mod mod1 { + mod mod2 { + pub struct Mod2Public; + struct Mod2Private; + } + pub use self::mod2::*; + + pub struct Mod1Public; + struct Mod1Private; +} +pub use mod1::*; + +// @has foo/index.html +// @has - "mod1" +// @has - "Mod1Public" +// @!has - "Mod1Private" +// @!has - "mod2" +// @has - "Mod2Public" +// @!has - "Mod2Private" +// @has foo/struct.Mod1Public.html +// @!has foo/struct.Mod1Private.html +// @has foo/struct.Mod2Public.html +// @!has foo/struct.Mod2Private.html + +// @has foo/mod1/index.html +// @has - "mod2" +// @has - "Mod1Public" +// @has - "Mod1Private" +// @!has - "Mod2Public" +// @!has - "Mod2Private" +// @has foo/mod1/struct.Mod1Public.html +// @has foo/mod1/struct.Mod1Private.html +// @!has foo/mod1/struct.Mod2Public.html +// @!has foo/mod1/struct.Mod2Private.html + +// @has foo/mod1/mod2/index.html +// @has - "Mod2Public" +// @has - "Mod2Private" +// @has foo/mod1/mod2/struct.Mod2Public.html +// @has foo/mod1/mod2/struct.Mod2Private.html + +// @!has foo/mod2/index.html +// @!has foo/mod2/struct.Mod2Public.html +// @!has foo/mod2/struct.Mod2Private.html diff --git a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs b/src/test/rustdoc/inline_local/glob-private-no-defaults.rs deleted file mode 100644 index ac854ac4320..00000000000 --- a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs +++ /dev/null @@ -1,48 +0,0 @@ -// compile-flags: --no-defaults - -#![crate_name = "foo"] - -mod mod1 { - mod mod2 { - pub struct Mod2Public; - struct Mod2Private; - } - pub use self::mod2::*; - - pub struct Mod1Public; - struct Mod1Private; -} -pub use mod1::*; - -// @has foo/index.html -// @has - "mod1" -// @has - "Mod1Public" -// @!has - "Mod1Private" -// @!has - "mod2" -// @has - "Mod2Public" -// @!has - "Mod2Private" -// @has foo/struct.Mod1Public.html -// @!has foo/struct.Mod1Private.html -// @has foo/struct.Mod2Public.html -// @!has foo/struct.Mod2Private.html - -// @has foo/mod1/index.html -// @has - "mod2" -// @has - "Mod1Public" -// @has - "Mod1Private" -// @!has - "Mod2Public" -// @!has - "Mod2Private" -// @has foo/mod1/struct.Mod1Public.html -// @has foo/mod1/struct.Mod1Private.html -// @!has foo/mod1/struct.Mod2Public.html -// @!has foo/mod1/struct.Mod2Private.html - -// @has foo/mod1/mod2/index.html -// @has - "Mod2Public" -// @has - "Mod2Private" -// @has foo/mod1/mod2/struct.Mod2Public.html -// @has foo/mod1/mod2/struct.Mod2Private.html - -// @!has foo/mod2/index.html -// @!has foo/mod2/struct.Mod2Public.html -// @!has foo/mod2/struct.Mod2Private.html -- cgit 1.4.1-3-g733a5