Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 0 insertions, 240 deletions

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
deleted file mode 100644
index 8e1089d60..000000000
--- a/src/test/rustdoc/inline_local/glob-extern-document-private-items.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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
-// @hasraw - "mod1"
-// @hasraw - "public_fn"
-// @!hasraw - "private_fn"
-// @has foo/fn.public_fn.html
-// @!has foo/fn.private_fn.html
-
-// @has foo/mod1/index.html
-// @hasraw - "public_fn"
-// @hasraw - "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.rs b/src/test/rustdoc/inline_local/glob-extern.rs
deleted file mode 100644
index c592a4db1..000000000
--- a/src/test/rustdoc/inline_local/glob-extern.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#![crate_name = "foo"]
-
-mod mod1 {
-    extern "C" {
-        pub fn public_fn();
-        fn private_fn();
-    }
-}
-
-pub use mod1::*;
-
-// @has foo/index.html
-// @!hasraw - "mod1"
-// @hasraw - "public_fn"
-// @!hasraw - "private_fn"
-// @has foo/fn.public_fn.html
-// @!has foo/fn.private_fn.html
-
-// @!has foo/mod1/index.html
-// @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
deleted file mode 100644
index d8cbd4234..000000000
--- a/src/test/rustdoc/inline_local/glob-private-document-private-items.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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
-// @hasraw - "mod1"
-// @hasraw - "Mod1Public"
-// @!hasraw - "Mod1Private"
-// @!hasraw - "mod2"
-// @hasraw - "Mod2Public"
-// @!hasraw - "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
-// @hasraw - "mod2"
-// @hasraw - "Mod1Public"
-// @hasraw - "Mod1Private"
-// @!hasraw - "Mod2Public"
-// @!hasraw - "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
-// @hasraw - "Mod2Public"
-// @hasraw - "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.rs b/src/test/rustdoc/inline_local/glob-private.rs
deleted file mode 100644
index 303f1d610..000000000
--- a/src/test/rustdoc/inline_local/glob-private.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-#![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
-// @!hasraw - "mod1"
-// @hasraw - "Mod1Public"
-// @!hasraw - "Mod1Private"
-// @!hasraw - "mod2"
-// @hasraw - "Mod2Public"
-// @!hasraw - "Mod2Private"
-// @has foo/struct.Mod1Public.html
-// @!has foo/struct.Mod1Private.html
-// @has foo/struct.Mod2Public.html
-// @!has foo/struct.Mod2Private.html
-
-// @has-dir foo/mod1
-// @!has foo/mod1/index.html
-// @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-dir foo/mod1/mod2
-// @!has foo/mod1/mod2/index.html
-// @has foo/mod1/mod2/struct.Mod2Public.html
-// @!has foo/mod1/mod2/struct.Mod2Private.html
-
-// @!has-dir foo/mod2
-// @!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/hidden-use.rs b/src/test/rustdoc/inline_local/hidden-use.rs
deleted file mode 100644
index de512fb26..000000000
--- a/src/test/rustdoc/inline_local/hidden-use.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod private {
-    pub struct Foo {}
-}
-
-// @has hidden_use/index.html
-// @!hasraw - 'private'
-// @!hasraw - 'Foo'
-// @!has hidden_use/struct.Foo.html
-#[doc(hidden)]
-pub use private::Foo;
diff --git a/src/test/rustdoc/inline_local/issue-28537.rs b/src/test/rustdoc/inline_local/issue-28537.rs
deleted file mode 100644
index da9cc4c94..000000000
--- a/src/test/rustdoc/inline_local/issue-28537.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#[doc(hidden)]
-pub mod foo {
-    pub struct Foo;
-}
-
-mod bar {
-    pub use self::bar::Bar;
-    mod bar {
-        pub struct Bar;
-    }
-}
-
-// @has issue_28537/struct.Foo.html
-pub use foo::Foo;
-
-// @has issue_28537/struct.Bar.html
-pub use self::bar::Bar;
diff --git a/src/test/rustdoc/inline_local/issue-32343.rs b/src/test/rustdoc/inline_local/issue-32343.rs
deleted file mode 100644
index 5620ae0dc..000000000
--- a/src/test/rustdoc/inline_local/issue-32343.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// @!has issue_32343/struct.Foo.html
-// @has issue_32343/index.html
-// @has - '//code' 'pub use foo::Foo'
-// @!has - '//code/a' 'Foo'
-#[doc(no_inline)]
-pub use foo::Foo;
-
-// @!has issue_32343/struct.Bar.html
-// @has issue_32343/index.html
-// @has - '//code' 'pub use foo::Bar'
-// @has - '//code/a' 'Bar'
-#[doc(no_inline)]
-pub use foo::Bar;
-
-mod foo {
-    pub struct Foo;
-    pub struct Bar;
-}
-
-pub mod bar {
-    // @has issue_32343/bar/struct.Bar.html
-    pub use ::foo::Bar;
-}
diff --git a/src/test/rustdoc/inline_local/macro_by_example.rs b/src/test/rustdoc/inline_local/macro_by_example.rs
deleted file mode 100644
index 5c33c0037..000000000
--- a/src/test/rustdoc/inline_local/macro_by_example.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-/// docs for foo
-#[deprecated(since = "1.2.3", note = "text")]
-#[macro_export]
-macro_rules! foo {
-    ($($tt:tt)*) => {}
-}
-
-// @has macro_by_example/macros/index.html
-pub mod macros {
-    // @!hasraw - 'pub use foo as bar;'
-    // @has macro_by_example/macros/macro.bar.html
-    // @has - '//*[@class="docblock"]' 'docs for foo'
-    // @has - '//*[@class="stab deprecated"]' 'Deprecated since 1.2.3: text'
-    // @has - '//a/@href' 'macro_by_example.rs.html#4-6'
-    #[doc(inline)]
-    pub use foo as bar;
-}
diff --git a/src/test/rustdoc/inline_local/please_inline.rs b/src/test/rustdoc/inline_local/please_inline.rs
deleted file mode 100644
index e4429ef33..000000000
--- a/src/test/rustdoc/inline_local/please_inline.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod foo {
-    pub struct Foo;
-}
-
-// @has please_inline/a/index.html
-pub mod a {
-    // @!hasraw - 'pub use foo::'
-    // @has please_inline/a/struct.Foo.html
-    #[doc(inline)]
-    pub use foo::Foo;
-}
-
-// @has please_inline/b/index.html
-pub mod b {
-    // @hasraw - 'pub use foo::'
-    // @!has please_inline/b/struct.Foo.html
-    #[feature(inline)]
-    pub use foo::Foo;
-}
diff --git a/src/test/rustdoc/inline_local/trait-vis.rs b/src/test/rustdoc/inline_local/trait-vis.rs
deleted file mode 100644
index 19b69da15..000000000
--- a/src/test/rustdoc/inline_local/trait-vis.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-pub trait ThisTrait {}
-
-mod asdf {
-    use ThisTrait;
-
-    pub struct SomeStruct;
-
-    impl ThisTrait for SomeStruct {}
-
-    trait PrivateTrait {}
-
-    impl PrivateTrait for SomeStruct {}
-}
-
-// @has trait_vis/struct.SomeStruct.html
-// @has - '//h3[@class="code-header"]' 'impl ThisTrait for SomeStruct'
-// @!has - '//h3[@class="code-header"]' 'impl PrivateTrait for SomeStruct'
-pub use asdf::SomeStruct;