Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 39 insertions, 0 deletions

diff --git a/tests/rustdoc-gui/src/lib2/implementors/Cargo.lock b/tests/rustdoc-gui/src/lib2/implementors/Cargo.lock
new file mode 100644
index 000000000..cad99a991
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/implementors/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "implementors"
+version = "0.1.0"
diff --git a/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml b/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml
new file mode 100644
index 000000000..9dafc43df
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/implementors/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "implementors"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+http = { path = "../http/" }
diff --git a/tests/rustdoc-gui/src/lib2/implementors/lib.rs b/tests/rustdoc-gui/src/lib2/implementors/lib.rs
new file mode 100644
index 000000000..2842ac50d
--- /dev/null
+++ b/tests/rustdoc-gui/src/lib2/implementors/lib.rs
@@ -0,0 +1,22 @@
+pub trait Whatever {
+    type Foo;
+
+    fn method() {}
+}
+
+pub struct Struct;
+
+impl Whatever for Struct {
+    type Foo = u8;
+}
+
+impl http::HttpTrait for Struct {}
+
+mod traits {
+    pub trait TraitToReexport {
+        fn method() {}
+    }
+}
+
+#[doc(inline)]
+pub use traits::TraitToReexport;