Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 34 deletions

diff --git a/src/test/rustdoc/intra-doc/trait-impl.rs b/src/test/rustdoc/intra-doc/trait-impl.rs
deleted file mode 100644
index cf60dc1db..000000000
--- a/src/test/rustdoc/intra-doc/trait-impl.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#![crate_name = "foo"]
-
-
-pub struct MyStruct;
-
-impl MyTrait for MyStruct {
-
-// @has foo/struct.MyStruct.html '//a/@href' 'struct.MyStruct.html#associatedtype.AssoType'
-
-    /// [`AssoType`]
-    ///
-    /// [`AssoType`]: MyStruct::AssoType
-    type AssoType = u32;
-
-// @has foo/struct.MyStruct.html '//a/@href' 'struct.MyStruct.html#associatedconstant.ASSO_CONST'
-
-    /// [`ASSO_CONST`]
-    ///
-    /// [`ASSO_CONST`]: MyStruct::ASSO_CONST
-    const ASSO_CONST: i32 = 10;
-
-// @has foo/struct.MyStruct.html '//a/@href' 'struct.MyStruct.html#method.trait_fn'
-
-    /// [`trait_fn`]
-    ///
-    /// [`trait_fn`]: MyStruct::trait_fn
-    fn trait_fn() { }
-}
-
-pub trait MyTrait {
-    type AssoType;
-    const ASSO_CONST: i32 = 1;
-    fn trait_fn();
-}