Merging upstream version 1.68.2+dfsg1.

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

4 files changed, 0 insertions, 63 deletions

diff --git a/src/test/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs b/src/test/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs
deleted file mode 100644
index bfe85f59e..000000000
--- a/src/test/rustdoc-json/intra-doc-links/auxiliary/enum_variant_in_trait_method.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub trait Trait {
-    /// [`Enum::Variant`]
-    fn method() {}
-}
-
-pub enum Enum {
-    Variant,
-}
diff --git a/src/test/rustdoc-json/intra-doc-links/foreign_variant.rs b/src/test/rustdoc-json/intra-doc-links/foreign_variant.rs
deleted file mode 100644
index e29682313..000000000
--- a/src/test/rustdoc-json/intra-doc-links/foreign_variant.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Regression test for <https://github.com/rust-lang/rust/issues/105025>
-// aux-build: enum_variant_in_trait_method.rs
-
-extern crate enum_variant_in_trait_method;
-
-pub struct Local;
-
-/// local impl
-impl enum_variant_in_trait_method::Trait for Local {}
-
-// @!has "$.index[*][?(@.name == 'Trait')]"
-// @!has "$.index[*][?(@.name == 'method')]"
-// @count "$.index[*][?(@.docs == 'local impl')].inner.items[*]" 0
diff --git a/src/test/rustdoc-json/intra-doc-links/non_page.rs b/src/test/rustdoc-json/intra-doc-links/non_page.rs
deleted file mode 100644
index 73c5334bb..000000000
--- a/src/test/rustdoc-json/intra-doc-links/non_page.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Regression test for <https://github.com/rust-lang/rust/issues/101531>,
-// where links where to the item who's HTML page had the item linked to.
-
-//! [`Struct::struct_field`]
-//! [`Enum::Variant`]
-//! [`Trait::AssocType`]
-//! [`Trait::ASSOC_CONST`]
-//! [`Trait::method`]
-
-// @set struct_field = "$.index[*][?(@.name=='struct_field')].id"
-// @set Variant = "$.index[*][?(@.name=='Variant')].id"
-// @set AssocType = "$.index[*][?(@.name=='AssocType')].id"
-// @set ASSOC_CONST = "$.index[*][?(@.name=='ASSOC_CONST')].id"
-// @set method = "$.index[*][?(@.name=='method')].id"
-
-// @is "$.index[*][?(@.name=='non_page')].links['`Struct::struct_field`']" $struct_field
-// @is "$.index[*][?(@.name=='non_page')].links['`Enum::Variant`']" $Variant
-// @is "$.index[*][?(@.name=='non_page')].links['`Trait::AssocType`']" $AssocType
-// @is "$.index[*][?(@.name=='non_page')].links['`Trait::ASSOC_CONST`']" $ASSOC_CONST
-// @is "$.index[*][?(@.name=='non_page')].links['`Trait::method`']" $method
-
-pub struct Struct {
-    pub struct_field: i32,
-}
-
-pub enum Enum {
-    Variant(),
-}
-
-pub trait Trait {
-    const ASSOC_CONST: i32;
-    type AssocType;
-    fn method();
-}
diff --git a/src/test/rustdoc-json/intra-doc-links/user_written.rs b/src/test/rustdoc-json/intra-doc-links/user_written.rs
deleted file mode 100644
index 6871dfea4..000000000
--- a/src/test/rustdoc-json/intra-doc-links/user_written.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//! For motivation, see [the reasons](foo#reasons)
-
-/// # Reasons
-/// To test rustdoc json
-pub fn foo() {}
-
-// @set foo = "$.index[*][?(@.name=='foo')].id"
-// @is "$.index[*][?(@.name=='user_written')].links['foo#reasons']" $foo