Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

5 files changed, 0 insertions, 101 deletions

diff --git a/src/test/rustdoc-json/traits/has_body.rs b/src/test/rustdoc-json/traits/has_body.rs
deleted file mode 100644
index a57cb97d4..000000000
--- a/src/test/rustdoc-json/traits/has_body.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// @has "$.index[*][?(@.name=='Foo')]"
-pub trait Foo {
-    // @is "$.index[*][?(@.name=='no_self')].inner.has_body" false
-    fn no_self();
-    // @is "$.index[*][?(@.name=='move_self')].inner.has_body" false
-    fn move_self(self);
-    // @is "$.index[*][?(@.name=='ref_self')].inner.has_body" false
-    fn ref_self(&self);
-
-    // @is "$.index[*][?(@.name=='no_self_def')].inner.has_body" true
-    fn no_self_def() {}
-    // @is "$.index[*][?(@.name=='move_self_def')].inner.has_body" true
-    fn move_self_def(self) {}
-    // @is "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true
-    fn ref_self_def(&self) {}
-}
-
-pub trait Bar: Clone {
-    // @is "$.index[*][?(@.name=='method')].inner.has_body" false
-    fn method(&self, param: usize);
-}
diff --git a/src/test/rustdoc-json/traits/implementors.rs b/src/test/rustdoc-json/traits/implementors.rs
deleted file mode 100644
index db3fe5df7..000000000
--- a/src/test/rustdoc-json/traits/implementors.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#![feature(no_core)]
-#![no_core]
-
-// @set wham = "$.index[*][?(@.name=='Wham')].id"
-// @count "$.index[*][?(@.name=='Wham')].inner.implementations[*]" 1
-// @set gmWham = "$.index[*][?(@.name=='Wham')].inner.implementations[0]"
-pub trait Wham {}
-
-// @count "$.index[*][?(@.name=='GeorgeMichael')].inner.impls[*]" 1
-// @is "$.index[*][?(@.name=='GeorgeMichael')].inner.impls[0]" $gmWham
-// @set gm = "$.index[*][?(@.name=='Wham')].id"
-
-// jsonpath_lib isnt expressive enough (for now) to get the "impl" item, so we
-// just check it isn't pointing to the type, but when you port to jsondocck-ng
-// check what the impl item is
-// @!is "$.index[*][?(@.name=='Wham')].inner.implementations[0]" $gm
-pub struct GeorgeMichael {}
-
-impl Wham for GeorgeMichael {}
diff --git a/src/test/rustdoc-json/traits/supertrait.rs b/src/test/rustdoc-json/traits/supertrait.rs
deleted file mode 100644
index 4048fdd74..000000000
--- a/src/test/rustdoc-json/traits/supertrait.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// ignore-tidy-linelength
-
-#![feature(no_core)]
-#![feature(lang_items)]
-#![no_core]
-
-// @set loud_id = "$.index[*][?(@.name=='Loud')].id"
-pub trait Loud {}
-
-// @set very_loud_id = "$.index[*][?(@.name=='VeryLoud')].id"
-// @count "$.index[*][?(@.name=='VeryLoud')].inner.bounds[*]" 1
-// @is    "$.index[*][?(@.name=='VeryLoud')].inner.bounds[0].trait_bound.trait.id" $loud_id
-pub trait VeryLoud: Loud {}
-
-// @set sounds_good_id = "$.index[*][?(@.name=='SoundsGood')].id"
-pub trait SoundsGood {}
-
-// @count "$.index[*][?(@.name=='MetalBand')].inner.bounds[*]" 2
-// @is    "$.index[*][?(@.name=='MetalBand')].inner.bounds[0].trait_bound.trait.id" $very_loud_id
-// @is    "$.index[*][?(@.name=='MetalBand')].inner.bounds[1].trait_bound.trait.id" $sounds_good_id
-pub trait MetalBand: VeryLoud + SoundsGood {}
-
-// @count "$.index[*][?(@.name=='DnabLatem')].inner.bounds[*]" 2
-// @is    "$.index[*][?(@.name=='DnabLatem')].inner.bounds[1].trait_bound.trait.id" $very_loud_id
-// @is    "$.index[*][?(@.name=='DnabLatem')].inner.bounds[0].trait_bound.trait.id" $sounds_good_id
-pub trait DnabLatem: SoundsGood + VeryLoud {}
diff --git a/src/test/rustdoc-json/traits/trait_alias.rs b/src/test/rustdoc-json/traits/trait_alias.rs
deleted file mode 100644
index 35db9296c..000000000
--- a/src/test/rustdoc-json/traits/trait_alias.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Regression test for <https://github.com/rust-lang/rust/issues/104923>
-// ignore-tidy-linelength
-
-#![feature(trait_alias)]
-
-// @set Orig = "$.index[*][?(@.name == 'Orig')].id"
-// @is "$.index[*][?(@.name == 'Orig')].kind" '"trait"'
-pub trait Orig<T> {}
-
-// @set Alias = "$.index[*][?(@.name == 'Alias')].id"
-// @is "$.index[*][?(@.name == 'Alias')].kind" '"trait_alias"'
-// @is "$.index[*][?(@.name == 'Alias')].inner.generics" '{"params": [], "where_predicates": []}'
-// @count "$.index[*][?(@.name == 'Alias')].inner.params[*]" 1
-// @is "$.index[*][?(@.name == 'Alias')].inner.params[0].trait_bound.trait.id" $Orig
-// @is "$.index[*][?(@.name == 'Alias')].inner.params[0].trait_bound.trait.args.angle_bracketed.args[0].type.inner" '"i32"'
-pub trait Alias = Orig<i32>;
-
-pub struct Struct;
-
-impl Orig<i32> for Struct {}
-
-// @is "$.index[*][?(@.name=='takes_alias')].inner.decl.inputs[0][1].kind" '"impl_trait"'
-// @is "$.index[*][?(@.name=='takes_alias')].inner.decl.inputs[0][1].inner[0].trait_bound.trait.id" $Alias
-// @is "$.index[*][?(@.name=='takes_alias')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" $Alias
-pub fn takes_alias(_: impl Alias) {}
-// FIXME: Should the trait be mentioned in both the decl and generics?
-
-fn main() {
-    takes_alias(Struct);
-}
diff --git a/src/test/rustdoc-json/traits/uses_extern_trait.rs b/src/test/rustdoc-json/traits/uses_extern_trait.rs
deleted file mode 100644
index 55a51f739..000000000
--- a/src/test/rustdoc-json/traits/uses_extern_trait.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![no_std]
-pub fn drop_default<T: core::default::Default>(_x: T) {}
-
-// @!has "$.index[*][?(@.name=='Debug')]"
-// @!has "$.index[*][?(@.name=='Default')]"