Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/rustdoc/impl-disambiguation.rs b/src/test/rustdoc/impl-disambiguation.rs
deleted file mode 100644
index 9e74ede8f..000000000
--- a/src/test/rustdoc/impl-disambiguation.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-#![crate_name = "foo"]
-
-pub trait Foo {}
-
-pub struct Bar<T> { field: T }
-
-// @has foo/trait.Foo.html '//*[@id="implementors-list"]//h3[@class="code-header"]' \
-//     "impl Foo for Bar<u8>"
-impl Foo for Bar<u8> {}
-// @has foo/trait.Foo.html '//*[@id="implementors-list"]//h3[@class="code-header"]' \
-//     "impl Foo for Bar<u16>"
-impl Foo for Bar<u16> {}
-// @has foo/trait.Foo.html '//*[@id="implementors-list"]//h3[@class="code-header"]' \
-//     "impl<'a> Foo for &'a Bar<u8>"
-impl<'a> Foo for &'a Bar<u8> {}
-
-pub mod mod1 {
-    pub struct Baz {}
-}
-
-pub mod mod2 {
-    pub enum Baz {}
-}
-
-// @has foo/trait.Foo.html '//*[@id="implementors-list"]//h3[@class="code-header"]' \
-//     "impl Foo for foo::mod1::Baz"
-impl Foo for mod1::Baz {}
-// @has foo/trait.Foo.html '//*[@id="implementors-list"]//h3[@class="code-header"]' \
-//     "impl<'a> Foo for &'a foo::mod2::Baz"
-impl<'a> Foo for &'a mod2::Baz {}