Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 38 deletions

diff --git a/src/test/rustdoc/doc-notable_trait.rs b/src/test/rustdoc/doc-notable_trait.rs
deleted file mode 100644
index 279faf554..000000000
--- a/src/test/rustdoc/doc-notable_trait.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-#![feature(doc_notable_trait)]
-
-pub struct Wrapper<T> {
-    inner: T,
-}
-
-impl<T: SomeTrait> SomeTrait for Wrapper<T> {}
-
-#[doc(notable_trait)]
-pub trait SomeTrait {
-    // @has doc_notable_trait/trait.SomeTrait.html
-    // @has - '//a[@class="notable-traits"]/@data-ty' 'Wrapper<Self>'
-    // @snapshot wrap-me - '//script[@id="notable-traits-data"]'
-    fn wrap_me(self) -> Wrapper<Self> where Self: Sized {
-        Wrapper {
-            inner: self,
-        }
-    }
-}
-
-pub struct SomeStruct;
-impl SomeTrait for SomeStruct {}
-
-impl SomeStruct {
-    // @has doc_notable_trait/struct.SomeStruct.html
-    // @has - '//a[@class="notable-traits"]/@data-ty' 'SomeStruct'
-    // @snapshot some-struct-new - '//script[@id="notable-traits-data"]'
-    pub fn new() -> SomeStruct {
-        SomeStruct
-    }
-}
-
-// @has doc_notable_trait/fn.bare_fn.html
-// @has - '//a[@class="notable-traits"]/@data-ty' 'SomeStruct'
-// @snapshot bare-fn - '//script[@id="notable-traits-data"]'
-pub fn bare_fn() -> SomeStruct {
-    SomeStruct
-}