Merging upstream version 1.74.1+dfsg1.

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

1 files changed, 0 insertions, 26 deletions

diff --git a/tests/rustdoc/issue-20646.rs b/tests/rustdoc/issue-20646.rs
deleted file mode 100644
index b2ee9c260..000000000
--- a/tests/rustdoc/issue-20646.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// aux-build:issue-20646.rs
-// ignore-cross-compile
-
-#![feature(associated_types)]
-
-extern crate issue_20646;
-
-// @has issue_20646/trait.Trait.html \
-//      '//*[@id="associatedtype.Output"]' \
-//      'type Output'
-pub trait Trait {
-    type Output;
-}
-
-// @has issue_20646/fn.fun.html \
-//      '//pre[@class="rust item-decl"]' 'where T: Trait<Output = i32>'
-pub fn fun<T>(_: T) where T: Trait<Output=i32> {}
-
-pub mod reexport {
-    // @has issue_20646/reexport/trait.Trait.html \
-    //      '//*[@id="associatedtype.Output"]' \
-    //      'type Output'
-    // @has issue_20646/reexport/fn.fun.html \
-    //      '//pre[@class="rust item-decl"]' 'where T: Trait<Output = i32>'
-    pub use issue_20646::{Trait, fun};
-}