Merging upstream version 1.68.2+dfsg1.

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

10 files changed, 0 insertions, 83 deletions

diff --git a/src/test/rustdoc-json/structs/plain_all_pub.rs b/src/test/rustdoc-json/structs/plain_all_pub.rs
deleted file mode 100644
index b86ab93c2..000000000
--- a/src/test/rustdoc-json/structs/plain_all_pub.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub struct Demo {
-    pub x: i32,
-    pub y: i32,
-}
-
-// @set x = "$.index[*][?(@.name=='x')].id"
-// @set y = "$.index[*][?(@.name=='y')].id"
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[0]" $x
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[1]" $y
-// @count "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[*]" 2
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields_stripped" false
diff --git a/src/test/rustdoc-json/structs/plain_doc_hidden.rs b/src/test/rustdoc-json/structs/plain_doc_hidden.rs
deleted file mode 100644
index 7800b55a4..000000000
--- a/src/test/rustdoc-json/structs/plain_doc_hidden.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub struct Demo {
-    pub x: i32,
-    #[doc(hidden)]
-    pub y: i32,
-}
-
-// @set x = "$.index[*][?(@.name=='x')].id"
-// @!has "$.index[*][?(@.name=='y')].id"
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[0]" $x
-// @count "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[*]" 1
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields_stripped" true
diff --git a/src/test/rustdoc-json/structs/plain_empty.rs b/src/test/rustdoc-json/structs/plain_empty.rs
deleted file mode 100644
index 1d01b8bc1..000000000
--- a/src/test/rustdoc-json/structs/plain_empty.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// @is "$.index[*][?(@.name=='PlainEmpty')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='PlainEmpty')].kind" \"struct\"
-// @is "$.index[*][?(@.name=='PlainEmpty')].inner.kind.plain.fields_stripped" false
-// @is "$.index[*][?(@.name=='PlainEmpty')].inner.kind.plain.fields" []
-pub struct PlainEmpty {}
diff --git a/src/test/rustdoc-json/structs/plain_pub_priv.rs b/src/test/rustdoc-json/structs/plain_pub_priv.rs
deleted file mode 100644
index 9b771224d..000000000
--- a/src/test/rustdoc-json/structs/plain_pub_priv.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub struct Demo {
-    pub x: i32,
-    y: i32,
-}
-
-// @set x = "$.index[*][?(@.name=='x')].id"
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[0]" $x
-// @count "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields[*]" 1
-// @is "$.index[*][?(@.name=='Demo')].inner.kind.plain.fields_stripped" true
diff --git a/src/test/rustdoc-json/structs/tuple.rs b/src/test/rustdoc-json/structs/tuple.rs
deleted file mode 100644
index 6bdb753ee..000000000
--- a/src/test/rustdoc-json/structs/tuple.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// @is "$.index[*][?(@.name=='Tuple')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='Tuple')].kind" \"struct\"
-// @is "$.index[*][?(@.name=='Tuple')].inner.kind.tuple" '[null, null]'
-pub struct Tuple(u32, String);
diff --git a/src/test/rustdoc-json/structs/tuple_empty.rs b/src/test/rustdoc-json/structs/tuple_empty.rs
deleted file mode 100644
index 0ad6a8954..000000000
--- a/src/test/rustdoc-json/structs/tuple_empty.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-// @is "$.index[*][?(@.name=='TupleUnit')].inner.kind.tuple" []
-pub struct TupleUnit();
diff --git a/src/test/rustdoc-json/structs/tuple_pub_priv.rs b/src/test/rustdoc-json/structs/tuple_pub_priv.rs
deleted file mode 100644
index 9d5a1d1c8..000000000
--- a/src/test/rustdoc-json/structs/tuple_pub_priv.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub struct Demo(
-    i32,
-    /// field
-    pub i32,
-    #[doc(hidden)] i32,
-);
-
-// @set field = "$.index[*][?(@.docs=='field')].id"
-
-// @is    "$.index[*][?(@.name=='Demo')].inner.kind.tuple[0]" null
-// @is    "$.index[*][?(@.name=='Demo')].inner.kind.tuple[1]" $field
-// @is    "$.index[*][?(@.name=='Demo')].inner.kind.tuple[2]" null
-// @count "$.index[*][?(@.name=='Demo')].inner.kind.tuple[*]" 3
diff --git a/src/test/rustdoc-json/structs/unit.rs b/src/test/rustdoc-json/structs/unit.rs
deleted file mode 100644
index 265709717..000000000
--- a/src/test/rustdoc-json/structs/unit.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// @is "$.index[*][?(@.name=='Unit')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='Unit')].kind" \"struct\"
-// @is "$.index[*][?(@.name=='Unit')].inner.kind" \"unit\"
-pub struct Unit;
diff --git a/src/test/rustdoc-json/structs/with_generics.rs b/src/test/rustdoc-json/structs/with_generics.rs
deleted file mode 100644
index 00474800a..000000000
--- a/src/test/rustdoc-json/structs/with_generics.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::collections::HashMap;
-
-// @is "$.index[*][?(@.name=='WithGenerics')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='WithGenerics')].kind" \"struct\"
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.generics.params[0].name" \"T\"
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.generics.params[0].kind.type.bounds" []
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.generics.params[1].name" \"U\"
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.generics.params[1].kind.type.bounds" []
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.kind.plain.fields_stripped" true
-// @is "$.index[*][?(@.name=='WithGenerics')].inner.kind.plain.fields" []
-pub struct WithGenerics<T, U> {
-    stuff: Vec<T>,
-    things: HashMap<U, U>,
-}
diff --git a/src/test/rustdoc-json/structs/with_primitives.rs b/src/test/rustdoc-json/structs/with_primitives.rs
deleted file mode 100644
index 9c5a37f39..000000000
--- a/src/test/rustdoc-json/structs/with_primitives.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// @is "$.index[*][?(@.name=='WithPrimitives')].visibility" \"public\"
-// @is "$.index[*][?(@.name=='WithPrimitives')].kind" \"struct\"
-// @is "$.index[*][?(@.name=='WithPrimitives')].inner.generics.params[0].name" \"\'a\"
-// @is "$.index[*][?(@.name=='WithPrimitives')].inner.generics.params[0].kind.lifetime.outlives" []
-// @is "$.index[*][?(@.name=='WithPrimitives')].inner.kind.plain.fields_stripped" true
-// @is "$.index[*][?(@.name=='WithPrimitives')].inner.kind.plain.fields" []
-pub struct WithPrimitives<'a> {
-    num: u32,
-    s: &'a str,
-}