diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:03 +0000 |
| commit | 64d98f8ee037282c35007b64c2649055c56af1db (patch) | |
| tree | 5492bcf97fce41ee1c0b1cc2add283f3e66cdab0 /src/test/rustdoc-json | |
| parent | Adding debian version 1.67.1+dfsg1-1. (diff) | |
| download | rustc-64d98f8ee037282c35007b64c2649055c56af1db.tar.xz rustc-64d98f8ee037282c35007b64c2649055c56af1db.zip | |
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/test/rustdoc-json')
103 files changed, 0 insertions, 2074 deletions
diff --git a/src/test/rustdoc-json/assoc_items.rs b/src/test/rustdoc-json/assoc_items.rs deleted file mode 100644 index 6d7f6bb96..000000000 --- a/src/test/rustdoc-json/assoc_items.rs +++ /dev/null @@ -1,37 +0,0 @@ -#![no_std] - -pub struct Simple; - -impl Simple { - // @is "$.index[*][?(@.name=='CONSTANT')].kind" \"assoc_const\" - pub const CONSTANT: usize = 0; -} - -pub trait EasyToImpl { - // @is "$.index[*][?(@.docs=='ToDeclare trait')].kind" \"assoc_type\" - // @is "$.index[*][?(@.docs=='ToDeclare trait')].inner.default" null - // @is "$.index[*][?(@.docs=='ToDeclare trait')].inner.bounds" [] - /// ToDeclare trait - type ToDeclare; - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].kind" \"assoc_const\" - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.default" null - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.type.kind" '"primitive"' - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE trait')].inner.type.inner" '"usize"' - /// AN_ATTRIBUTE trait - const AN_ATTRIBUTE: usize; -} - -impl EasyToImpl for Simple { - // @is "$.index[*][?(@.docs=='ToDeclare impl')].kind" '"assoc_type"' - // @is "$.index[*][?(@.docs=='ToDeclare impl')].inner.default.kind" \"primitive\" - // @is "$.index[*][?(@.docs=='ToDeclare impl')].inner.default.inner" \"usize\" - /// ToDeclare impl - type ToDeclare = usize; - - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].kind" '"assoc_const"' - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.type.kind" \"primitive\" - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.type.inner" \"usize\" - // @is "$.index[*][?(@.docs=='AN_ATTRIBUTE impl')].inner.default" \"12\" - /// AN_ATTRIBUTE impl - const AN_ATTRIBUTE: usize = 12; -} diff --git a/src/test/rustdoc-json/assoc_type.rs b/src/test/rustdoc-json/assoc_type.rs deleted file mode 100644 index edc1f73c8..000000000 --- a/src/test/rustdoc-json/assoc_type.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/98547>. - -// @has "$.index[*][?(@.name=='Trait')]" -// @has "$.index[*][?(@.name=='AssocType')]" -// @has "$.index[*][?(@.name=='S')]" -// @has "$.index[*][?(@.name=='S2')]" - -pub trait Trait { - type AssocType; -} - -impl<T> Trait for T { - type AssocType = Self; -} - -pub struct S; - -/// Not needed for the #98547 ICE to occur, but added to maximize the chance of -/// getting an ICE in the future. See -/// <https://github.com/rust-lang/rust/pull/98548#discussion_r908219164> -pub struct S2; diff --git a/src/test/rustdoc-json/blanket_impls.rs b/src/test/rustdoc-json/blanket_impls.rs deleted file mode 100644 index c5cc87ca1..000000000 --- a/src/test/rustdoc-json/blanket_impls.rs +++ /dev/null @@ -1,8 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/98658> - -#![no_std] - -// @has "$.index[*][?(@.name=='Error')].kind" \"assoc_type\" -// @has "$.index[*][?(@.name=='Error')].inner.default.kind" \"resolved_path\" -// @has "$.index[*][?(@.name=='Error')].inner.default.inner.name" \"Infallible\" -pub struct ForBlanketTryFromImpl; diff --git a/src/test/rustdoc-json/doc_hidden_failure.rs b/src/test/rustdoc-json/doc_hidden_failure.rs deleted file mode 100644 index 6573166c4..000000000 --- a/src/test/rustdoc-json/doc_hidden_failure.rs +++ /dev/null @@ -1,22 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/98007>. - -#![feature(no_core)] -#![no_core] - -mod auto { - mod action_row { - pub struct ActionRowBuilder; - } - - #[doc(hidden)] - pub mod builders { - pub use super::action_row::ActionRowBuilder; - } -} - -// @count "$.index[*][?(@.name=='builders')]" 2 -pub use auto::*; - -pub mod builders { - pub use crate::auto::builders::*; -} diff --git a/src/test/rustdoc-json/enums/auxiliary/color.rs b/src/test/rustdoc-json/enums/auxiliary/color.rs deleted file mode 100644 index 7188f7938..000000000 --- a/src/test/rustdoc-json/enums/auxiliary/color.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub enum Color { - Red, - Green, - Blue, -} diff --git a/src/test/rustdoc-json/enums/discriminant/basic.rs b/src/test/rustdoc-json/enums/discriminant/basic.rs deleted file mode 100644 index 8c221615a..000000000 --- a/src/test/rustdoc-json/enums/discriminant/basic.rs +++ /dev/null @@ -1,12 +0,0 @@ -#[repr(i8)] -pub enum Ordering { - // @is "$.index[*][?(@.name=='Less')].inner.variant_inner.expr" '"-1"' - // @is "$.index[*][?(@.name=='Less')].inner.variant_inner.value" '"-1"' - Less = -1, - // @is "$.index[*][?(@.name=='Equal')].inner.variant_inner.expr" '"0"' - // @is "$.index[*][?(@.name=='Equal')].inner.variant_inner.value" '"0"' - Equal = 0, - // @is "$.index[*][?(@.name=='Greater')].inner.variant_inner.expr" '"1"' - // @is "$.index[*][?(@.name=='Greater')].inner.variant_inner.value" '"1"' - Greater = 1, -} diff --git a/src/test/rustdoc-json/enums/discriminant/expr.rs b/src/test/rustdoc-json/enums/discriminant/expr.rs deleted file mode 100644 index 235b0b473..000000000 --- a/src/test/rustdoc-json/enums/discriminant/expr.rs +++ /dev/null @@ -1,39 +0,0 @@ -pub enum Foo { - // @is "$.index[*][?(@.name=='Addition')].inner.variant_inner.value" '"0"' - // @is "$.index[*][?(@.name=='Addition')].inner.variant_inner.expr" '"{ _ }"' - Addition = 0 + 0, - // @is "$.index[*][?(@.name=='Bin')].inner.variant_inner.value" '"1"' - // @is "$.index[*][?(@.name=='Bin')].inner.variant_inner.expr" '"0b1"' - Bin = 0b1, - // @is "$.index[*][?(@.name=='Oct')].inner.variant_inner.value" '"2"' - // @is "$.index[*][?(@.name=='Oct')].inner.variant_inner.expr" '"0o2"' - Oct = 0o2, - // @is "$.index[*][?(@.name=='PubConst')].inner.variant_inner.value" '"3"' - // @is "$.index[*][?(@.name=='PubConst')].inner.variant_inner.expr" '"THREE"' - PubConst = THREE, - // @is "$.index[*][?(@.name=='Hex')].inner.variant_inner.value" '"4"' - // @is "$.index[*][?(@.name=='Hex')].inner.variant_inner.expr" '"0x4"' - Hex = 0x4, - // @is "$.index[*][?(@.name=='Cast')].inner.variant_inner.value" '"5"' - // @is "$.index[*][?(@.name=='Cast')].inner.variant_inner.expr" '"{ _ }"' - Cast = 5 as isize, - // @is "$.index[*][?(@.name=='PubCall')].inner.variant_inner.value" '"6"' - // @is "$.index[*][?(@.name=='PubCall')].inner.variant_inner.expr" '"{ _ }"' - PubCall = six(), - // @is "$.index[*][?(@.name=='PrivCall')].inner.variant_inner.value" '"7"' - // @is "$.index[*][?(@.name=='PrivCall')].inner.variant_inner.expr" '"{ _ }"' - PrivCall = seven(), - // @is "$.index[*][?(@.name=='PrivConst')].inner.variant_inner.value" '"8"' - // @is "$.index[*][?(@.name=='PrivConst')].inner.variant_inner.expr" '"EIGHT"' - PrivConst = EIGHT, -} - -pub const THREE: isize = 3; -const EIGHT: isize = 8; - -pub const fn six() -> isize { - 6 -} -const fn seven() -> isize { - 7 -} diff --git a/src/test/rustdoc-json/enums/discriminant/limits.rs b/src/test/rustdoc-json/enums/discriminant/limits.rs deleted file mode 100644 index 8df73d78d..000000000 --- a/src/test/rustdoc-json/enums/discriminant/limits.rs +++ /dev/null @@ -1,43 +0,0 @@ -// ignore-tidy-linelength -#![feature(repr128)] -#![allow(incomplete_features)] - -#[repr(u64)] -pub enum U64 { - // @is "$.index[*][?(@.name=='U64Min')].inner.variant_inner.value" '"0"' - // @is "$.index[*][?(@.name=='U64Min')].inner.variant_inner.expr" '"u64::MIN"' - U64Min = u64::MIN, - // @is "$.index[*][?(@.name=='U64Max')].inner.variant_inner.value" '"18446744073709551615"' - // @is "$.index[*][?(@.name=='U64Max')].inner.variant_inner.expr" '"u64::MAX"' - U64Max = u64::MAX, -} - -#[repr(i64)] -pub enum I64 { - // @is "$.index[*][?(@.name=='I64Min')].inner.variant_inner.value" '"-9223372036854775808"' - // @is "$.index[*][?(@.name=='I64Min')].inner.variant_inner.expr" '"i64::MIN"' - I64Min = i64::MIN, - // @is "$.index[*][?(@.name=='I64Max')].inner.variant_inner.value" '"9223372036854775807"' - // @is "$.index[*][?(@.name=='I64Max')].inner.variant_inner.expr" '"i64::MAX"' - I64Max = i64::MAX, -} - -#[repr(u128)] -pub enum U128 { - // @is "$.index[*][?(@.name=='U128Min')].inner.variant_inner.value" '"0"' - // @is "$.index[*][?(@.name=='U128Min')].inner.variant_inner.expr" '"u128::MIN"' - U128Min = u128::MIN, - // @is "$.index[*][?(@.name=='U128Max')].inner.variant_inner.value" '"340282366920938463463374607431768211455"' - // @is "$.index[*][?(@.name=='U128Max')].inner.variant_inner.expr" '"u128::MAX"' - U128Max = u128::MAX, -} - -#[repr(i128)] -pub enum I128 { - // @is "$.index[*][?(@.name=='I128Min')].inner.variant_inner.value" '"-170141183460469231731687303715884105728"' - // @is "$.index[*][?(@.name=='I128Min')].inner.variant_inner.expr" '"i128::MIN"' - I128Min = i128::MIN, - // @is "$.index[*][?(@.name=='I128Max')].inner.variant_inner.value" '"170141183460469231731687303715884105727"' - // @is "$.index[*][?(@.name=='I128Max')].inner.variant_inner.expr" '"i128::MAX"' - I128Max = i128::MAX, -} diff --git a/src/test/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs b/src/test/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs deleted file mode 100644 index 3417baa07..000000000 --- a/src/test/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs +++ /dev/null @@ -1,15 +0,0 @@ -#[repr(u32)] -pub enum Foo { - // @is "$.index[*][?(@.name=='Basic')].inner.variant_inner.value" '"0"' - // @is "$.index[*][?(@.name=='Basic')].inner.variant_inner.expr" '"0"' - Basic = 0, - // @is "$.index[*][?(@.name=='Suffix')].inner.variant_inner.value" '"10"' - // @is "$.index[*][?(@.name=='Suffix')].inner.variant_inner.expr" '"10u32"' - Suffix = 10u32, - // @is "$.index[*][?(@.name=='Underscore')].inner.variant_inner.value" '"100"' - // @is "$.index[*][?(@.name=='Underscore')].inner.variant_inner.expr" '"1_0_0"' - Underscore = 1_0_0, - // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.variant_inner.value" '"1000"' - // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.variant_inner.expr" '"1_0_0_0u32"' - SuffixUnderscore = 1_0_0_0u32, -} diff --git a/src/test/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs b/src/test/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs deleted file mode 100644 index 6af944a22..000000000 --- a/src/test/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs +++ /dev/null @@ -1,10 +0,0 @@ -pub enum Foo { - // @is "$.index[*][?(@.name=='Has')].inner.variant_inner" '{"expr":"0", "value":"0"}' - Has = 0, - // @is "$.index[*][?(@.name=='Doesnt')].inner.variant_inner" null - Doesnt, - // @is "$.index[*][?(@.name=='AlsoDoesnt')].inner.variant_inner" null - AlsoDoesnt, - // @is "$.index[*][?(@.name=='AlsoHas')].inner.variant_inner" '{"expr":"44", "value":"44"}' - AlsoHas = 44, -} diff --git a/src/test/rustdoc-json/enums/doc_link_to_foreign_variant.rs b/src/test/rustdoc-json/enums/doc_link_to_foreign_variant.rs deleted file mode 100644 index 470b195a2..000000000 --- a/src/test/rustdoc-json/enums/doc_link_to_foreign_variant.rs +++ /dev/null @@ -1,11 +0,0 @@ -// aux-build: color.rs - -//! The purpose of this test it to have a link to [a foreign variant](Red). - -extern crate color; -use color::Color::Red; - -// @set red = "$.index[*][?(@.inner.is_crate == true)].links.Red" - -// @!has "$.index[*][?(@.name == 'Red')]" -// @!has "$.index[*][?(@.name == 'Color')]" diff --git a/src/test/rustdoc-json/enums/field_hidden.rs b/src/test/rustdoc-json/enums/field_hidden.rs deleted file mode 100644 index e6310cc3b..000000000 --- a/src/test/rustdoc-json/enums/field_hidden.rs +++ /dev/null @@ -1,13 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/100529>. - -#![no_core] -#![feature(no_core)] - -// @has "$.index[*][?(@.name=='ParseError')]" -// @has "$.index[*][?(@.name=='UnexpectedEndTag')]" -// @is "$.index[*][?(@.name=='UnexpectedEndTag')].inner.variant_kind" '"tuple"' -// @is "$.index[*][?(@.name=='UnexpectedEndTag')].inner.variant_inner" [null] - -pub enum ParseError { - UnexpectedEndTag(#[doc(hidden)] u32), -} diff --git a/src/test/rustdoc-json/enums/kind.rs b/src/test/rustdoc-json/enums/kind.rs deleted file mode 100644 index e9ea3ae23..000000000 --- a/src/test/rustdoc-json/enums/kind.rs +++ /dev/null @@ -1,37 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -pub enum Foo { - // @set Unit = "$.index[*][?(@.name=='Unit')].id" - // @is "$.index[*][?(@.name=='Unit')].inner.variant_kind" '"plain"' - // @is "$.index[*][?(@.name=='Unit')].inner.variant_inner" null - Unit, - // @set Named = "$.index[*][?(@.name=='Named')].id" - // @is "$.index[*][?(@.name=='Named')].inner.variant_kind" '"struct"' - // @is "$.index[*][?(@.name=='Named')].inner.variant_inner" '{"fields": [], "fields_stripped": false}' - Named {}, - // @set Tuple = "$.index[*][?(@.name=='Tuple')].id" - // @is "$.index[*][?(@.name=='Tuple')].inner.variant_kind" '"tuple"' - // @is "$.index[*][?(@.name=='Tuple')].inner.variant_inner" [] - Tuple(), - // @set NamedField = "$.index[*][?(@.name=='NamedField')].id" - // @set x = "$.index[*][?(@.name=='x' && @.kind=='struct_field')].id" - // @is "$.index[*][?(@.name=='NamedField')].inner.variant_kind" '"struct"' - // @is "$.index[*][?(@.name=='NamedField')].inner.variant_inner.fields[*]" $x - // @is "$.index[*][?(@.name=='NamedField')].inner.variant_inner.fields_stripped" false - NamedField { x: i32 }, - // @set TupleField = "$.index[*][?(@.name=='TupleField')].id" - // @is "$.index[*][?(@.name=='TupleField')].inner.variant_kind" '"tuple"' - // @set tup_field = "$.index[*][?(@.name=='0' && @.kind=='struct_field')].id" - // @is "$.index[*][?(@.name=='TupleField')].inner.variant_inner[*]" $tup_field - TupleField(i32), -} - -// @is "$.index[*][?(@.name=='Foo')].inner.variants[0]" $Unit -// @is "$.index[*][?(@.name=='Foo')].inner.variants[1]" $Named -// @is "$.index[*][?(@.name=='Foo')].inner.variants[2]" $Tuple -// @is "$.index[*][?(@.name=='Foo')].inner.variants[3]" $NamedField -// @is "$.index[*][?(@.name=='Foo')].inner.variants[4]" $TupleField -// @count "$.index[*][?(@.name=='Foo')].inner.variants[*]" 5 diff --git a/src/test/rustdoc-json/enums/struct_field_hidden.rs b/src/test/rustdoc-json/enums/struct_field_hidden.rs deleted file mode 100644 index f612a34a4..000000000 --- a/src/test/rustdoc-json/enums/struct_field_hidden.rs +++ /dev/null @@ -1,17 +0,0 @@ -pub enum Foo { - Variant { - #[doc(hidden)] - a: i32, - // @set b = "$.index[*][?(@.name=='b')].id" - b: i32, - #[doc(hidden)] - x: i32, - // @set y = "$.index[*][?(@.name=='y')].id" - y: i32, - }, - // @is "$.index[*][?(@.name=='Variant')].inner.variant_kind" '"struct"' - // @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields_stripped" true - // @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[0]" $b - // @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[1]" $y - // @count "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[*]" 2 -} diff --git a/src/test/rustdoc-json/enums/tuple_fields_hidden.rs b/src/test/rustdoc-json/enums/tuple_fields_hidden.rs deleted file mode 100644 index f546eaa0d..000000000 --- a/src/test/rustdoc-json/enums/tuple_fields_hidden.rs +++ /dev/null @@ -1,94 +0,0 @@ -#![feature(no_core)] -#![no_core] - -// @set 1.1.0 = "$.index[*][?(@.docs=='1.1.0')].id" -// @set 2.1.0 = "$.index[*][?(@.docs=='2.1.0')].id" -// @set 2.1.1 = "$.index[*][?(@.docs=='2.1.1')].id" -// @set 2.2.1 = "$.index[*][?(@.docs=='2.2.1')].id" -// @set 2.3.0 = "$.index[*][?(@.docs=='2.3.0')].id" -// @set 3.1.1 = "$.index[*][?(@.docs=='3.1.1')].id" -// @set 3.1.2 = "$.index[*][?(@.docs=='3.1.2')].id" -// @set 3.2.0 = "$.index[*][?(@.docs=='3.2.0')].id" -// @set 3.2.2 = "$.index[*][?(@.docs=='3.2.2')].id" -// @set 3.3.0 = "$.index[*][?(@.docs=='3.3.0')].id" -// @set 3.3.1 = "$.index[*][?(@.docs=='3.3.1')].id" - -pub enum EnumWithStrippedTupleVariants { - // @is "$.index[*][?(@.name=='None')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='None')].inner.variant_inner[*]" 0 - None(), - - // @is "$.index[*][?(@.name=='One')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='One')].inner.variant_inner[*]" 1 - // @is "$.index[*][?(@.name=='One')].inner.variant_inner[0]" $1.1.0 - One(/** 1.1.0*/ bool), - // @is "$.index[*][?(@.name=='OneHidden')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='OneHidden')].inner.variant_inner[*]" 1 - // @is "$.index[*][?(@.name=='OneHidden')].inner.variant_inner[0]" null - OneHidden(#[doc(hidden)] bool), - - // @is "$.index[*][?(@.name=='Two')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='Two')].inner.variant_inner[*]" 2 - // @is "$.index[*][?(@.name=='Two')].inner.variant_inner[0]" $2.1.0 - // @is "$.index[*][?(@.name=='Two')].inner.variant_inner[1]" $2.1.1 - Two(/** 2.1.0*/ bool, /** 2.1.1*/ bool), - // @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[*]" 2 - // @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[0]" null - // @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[1]" $2.2.1 - TwoLeftHidden(#[doc(hidden)] bool, /** 2.2.1*/ bool), - // @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[*]" 2 - // @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[0]" $2.3.0 - // @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[1]" null - TwoRightHidden(/** 2.3.0*/ bool, #[doc(hidden)] bool), - // @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[*]" 2 - // @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[0]" null - // @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[1]" null - TwoBothHidden(#[doc(hidden)] bool, #[doc(hidden)] bool), - - // @is "$.index[*][?(@.name=='Three1')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='Three1')].inner.variant_inner[*]" 3 - // @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[0]" null - // @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[1]" $3.1.1 - // @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[2]" $3.1.2 - Three1(#[doc(hidden)] bool, /** 3.1.1*/ bool, /** 3.1.2*/ bool), - // @is "$.index[*][?(@.name=='Three2')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='Three2')].inner.variant_inner[*]" 3 - // @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[0]" $3.2.0 - // @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[1]" null - // @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[2]" $3.2.2 - Three2(/** 3.2.0*/ bool, #[doc(hidden)] bool, /** 3.2.2*/ bool), - // @is "$.index[*][?(@.name=='Three3')].inner.variant_kind" '"tuple"' - // @count "$.index[*][?(@.name=='Three3')].inner.variant_inner[*]" 3 - // @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[0]" $3.3.0 - // @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[1]" $3.3.1 - // @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[2]" null - Three3(/** 3.3.0*/ bool, /** 3.3.1*/ bool, #[doc(hidden)] bool), -} - - -// @is "$.index[*][?(@.docs=='1.1.0')].name" '"0"' -// @is "$.index[*][?(@.docs=='2.1.0')].name" '"0"' -// @is "$.index[*][?(@.docs=='2.1.1')].name" '"1"' -// @is "$.index[*][?(@.docs=='2.2.1')].name" '"1"' -// @is "$.index[*][?(@.docs=='2.3.0')].name" '"0"' -// @is "$.index[*][?(@.docs=='3.1.1')].name" '"1"' -// @is "$.index[*][?(@.docs=='3.1.2')].name" '"2"' -// @is "$.index[*][?(@.docs=='3.2.0')].name" '"0"' -// @is "$.index[*][?(@.docs=='3.2.2')].name" '"2"' -// @is "$.index[*][?(@.docs=='3.3.0')].name" '"0"' -// @is "$.index[*][?(@.docs=='3.3.1')].name" '"1"' - -// @is "$.index[*][?(@.docs=='1.1.0')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='2.1.0')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='2.1.1')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='2.2.1')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='2.3.0')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.1.1')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.1.2')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.2.0')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.2.2')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.3.0')].inner" '{"kind": "primitive", "inner": "bool"}' -// @is "$.index[*][?(@.docs=='3.3.1')].inner" '{"kind": "primitive", "inner": "bool"}' diff --git a/src/test/rustdoc-json/enums/use_glob.rs b/src/test/rustdoc-json/enums/use_glob.rs deleted file mode 100644 index 62b8b832a..000000000 --- a/src/test/rustdoc-json/enums/use_glob.rs +++ /dev/null @@ -1,18 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/104942> - -#![feature(no_core)] -#![no_core] - -// @set Color = "$.index[*][?(@.name == 'Color')].id" -pub enum Color { - Red, - Green, - Blue, -} - -// @set use_Color = "$.index[*][?(@.kind == 'import')].id" -// @is "$.index[*][?(@.kind == 'import')].inner.id" $Color -// @is "$.index[*][?(@.kind == 'import')].inner.glob" true -pub use Color::*; - -// @ismany "$.index[*][?(@.name == 'use_glob')].inner.items[*]" $Color $use_Color diff --git a/src/test/rustdoc-json/enums/use_variant.rs b/src/test/rustdoc-json/enums/use_variant.rs deleted file mode 100644 index 5f0d2b9b1..000000000 --- a/src/test/rustdoc-json/enums/use_variant.rs +++ /dev/null @@ -1,15 +0,0 @@ -#![feature(no_core)] -#![no_core] - -// @set AlwaysNone = "$.index[*][?(@.name == 'AlwaysNone')].id" -pub enum AlwaysNone { - // @set None = "$.index[*][?(@.name == 'None')].id" - None, -} -// @is "$.index[*][?(@.name == 'AlwaysNone')].inner.variants[*]" $None - -// @set use_None = "$.index[*][?(@.kind == 'import')].id" -// @is "$.index[*][?(@.kind == 'import')].inner.id" $None -pub use AlwaysNone::None; - -// @ismany "$.index[*][?(@.name == 'use_variant')].inner.items[*]" $AlwaysNone $use_None diff --git a/src/test/rustdoc-json/enums/use_variant_foreign.rs b/src/test/rustdoc-json/enums/use_variant_foreign.rs deleted file mode 100644 index 11bb6ce1f..000000000 --- a/src/test/rustdoc-json/enums/use_variant_foreign.rs +++ /dev/null @@ -1,9 +0,0 @@ -// aux-build: color.rs - -extern crate color; - -// @is "$.index[*][?(@.inner.name == 'Red')].kind" '"import"' -pub use color::Color::Red; - -// @!has "$.index[*][?(@.name == 'Red')]" -// @!has "$.index[*][?(@.name == 'Color')]" diff --git a/src/test/rustdoc-json/enums/variant_struct.rs b/src/test/rustdoc-json/enums/variant_struct.rs deleted file mode 100644 index 23b854d8d..000000000 --- a/src/test/rustdoc-json/enums/variant_struct.rs +++ /dev/null @@ -1,11 +0,0 @@ -// @is "$.index[*][?(@.name=='EnumStruct')].visibility" \"public\" -// @is "$.index[*][?(@.name=='EnumStruct')].kind" \"enum\" -pub enum EnumStruct { - // @is "$.index[*][?(@.name=='VariantS')].inner.variant_kind" \"struct\" - // @is "$.index[*][?(@.name=='x')].kind" \"struct_field\" - // @is "$.index[*][?(@.name=='y')].kind" \"struct_field\" - VariantS { - x: u32, - y: String, - }, -} diff --git a/src/test/rustdoc-json/enums/variant_tuple_struct.rs b/src/test/rustdoc-json/enums/variant_tuple_struct.rs deleted file mode 100644 index b71ec47a8..000000000 --- a/src/test/rustdoc-json/enums/variant_tuple_struct.rs +++ /dev/null @@ -1,8 +0,0 @@ -// @is "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\" -// @is "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\" -pub enum EnumTupleStruct { - // @is "$.index[*][?(@.name=='VariantA')].inner.variant_kind" \"tuple\" - // @is "$.index[*][?(@.name=='0')].kind" \"struct_field\" - // @is "$.index[*][?(@.name=='1')].kind" \"struct_field\" - VariantA(u32, String), -} diff --git a/src/test/rustdoc-json/fn_pointer/abi.rs b/src/test/rustdoc-json/fn_pointer/abi.rs deleted file mode 100644 index 3c1a453d1..000000000 --- a/src/test/rustdoc-json/fn_pointer/abi.rs +++ /dev/null @@ -1,25 +0,0 @@ -// ignore-tidy-linelength - -#![feature(abi_vectorcall)] -#![feature(c_unwind)] - -// @is "$.index[*][?(@.name=='AbiRust')].inner.type.inner.header.abi" \"Rust\" -pub type AbiRust = fn(); - -// @is "$.index[*][?(@.name=='AbiC')].inner.type.inner.header.abi" '{"C": {"unwind": false}}' -pub type AbiC = extern "C" fn(); - -// @is "$.index[*][?(@.name=='AbiSystem')].inner.type.inner.header.abi" '{"System": {"unwind": false}}' -pub type AbiSystem = extern "system" fn(); - -// @is "$.index[*][?(@.name=='AbiCUnwind')].inner.type.inner.header.abi" '{"C": {"unwind": true}}' -pub type AbiCUnwind = extern "C-unwind" fn(); - -// @is "$.index[*][?(@.name=='AbiSystemUnwind')].inner.type.inner.header.abi" '{"System": {"unwind": true}}' -pub type AbiSystemUnwind = extern "system-unwind" fn(); - -// @is "$.index[*][?(@.name=='AbiVecorcall')].inner.type.inner.header.abi.Other" '"\"vectorcall\""' -pub type AbiVecorcall = extern "vectorcall" fn(); - -// @is "$.index[*][?(@.name=='AbiVecorcallUnwind')].inner.type.inner.header.abi.Other" '"\"vectorcall-unwind\""' -pub type AbiVecorcallUnwind = extern "vectorcall-unwind" fn(); diff --git a/src/test/rustdoc-json/fn_pointer/generics.rs b/src/test/rustdoc-json/fn_pointer/generics.rs deleted file mode 100644 index a93b01ac2..000000000 --- a/src/test/rustdoc-json/fn_pointer/generics.rs +++ /dev/null @@ -1,14 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @count "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][0]" '"val"' -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.inputs[0][1].inner.lifetime" \"\'c\" -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.decl.output" '{ "kind": "primitive", "inner": "i32" }' -// @count "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[*]" 1 -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].name" \"\'c\" -// @is "$.index[*][?(@.name=='WithHigherRankTraitBounds')].inner.type.inner.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }' -pub type WithHigherRankTraitBounds = for<'c> fn(val: &'c i32) -> i32; diff --git a/src/test/rustdoc-json/fn_pointer/qualifiers.rs b/src/test/rustdoc-json/fn_pointer/qualifiers.rs deleted file mode 100644 index bd65bb3ee..000000000 --- a/src/test/rustdoc-json/fn_pointer/qualifiers.rs +++ /dev/null @@ -1,9 +0,0 @@ -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.unsafe" false -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.const" false -// @is "$.index[*][?(@.name=='FnPointer')].inner.type.inner.header.async" false -pub type FnPointer = fn(); - -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.unsafe" true -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.const" false -// @is "$.index[*][?(@.name=='UnsafePointer')].inner.type.inner.header.async" false -pub type UnsafePointer = unsafe fn(); diff --git a/src/test/rustdoc-json/fns/abi.rs b/src/test/rustdoc-json/fns/abi.rs deleted file mode 100644 index 0e8b78bc0..000000000 --- a/src/test/rustdoc-json/fns/abi.rs +++ /dev/null @@ -1,25 +0,0 @@ -// ignore-tidy-linelength - -#![feature(abi_vectorcall)] -#![feature(c_unwind)] - -// @is "$.index[*][?(@.name=='abi_rust')].inner.header.abi" \"Rust\" -pub fn abi_rust() {} - -// @is "$.index[*][?(@.name=='abi_c')].inner.header.abi" '{"C": {"unwind": false}}' -pub extern "C" fn abi_c() {} - -// @is "$.index[*][?(@.name=='abi_system')].inner.header.abi" '{"System": {"unwind": false}}' -pub extern "system" fn abi_system() {} - -// @is "$.index[*][?(@.name=='abi_c_unwind')].inner.header.abi" '{"C": {"unwind": true}}' -pub extern "C-unwind" fn abi_c_unwind() {} - -// @is "$.index[*][?(@.name=='abi_system_unwind')].inner.header.abi" '{"System": {"unwind": true}}' -pub extern "system-unwind" fn abi_system_unwind() {} - -// @is "$.index[*][?(@.name=='abi_vectorcall')].inner.header.abi.Other" '"\"vectorcall\""' -pub extern "vectorcall" fn abi_vectorcall() {} - -// @is "$.index[*][?(@.name=='abi_vectorcall_unwind')].inner.header.abi.Other" '"\"vectorcall-unwind\""' -pub extern "vectorcall-unwind" fn abi_vectorcall_unwind() {} diff --git a/src/test/rustdoc-json/fns/async_return.rs b/src/test/rustdoc-json/fns/async_return.rs deleted file mode 100644 index b89781ca9..000000000 --- a/src/test/rustdoc-json/fns/async_return.rs +++ /dev/null @@ -1,36 +0,0 @@ -// edition:2021 -// ignore-tidy-linelength - -// Regression test for <https://github.com/rust-lang/rust/issues/101199> - -use std::future::Future; - -// @is "$.index[*][?(@.name=='get_int')].inner.decl.output" '{"inner": "i32", "kind": "primitive"}' -// @is "$.index[*][?(@.name=='get_int')].inner.header.async" false -pub fn get_int() -> i32 { - 42 -} - -// @is "$.index[*][?(@.name=='get_int_async')].inner.decl.output" '{"inner": "i32", "kind": "primitive"}' -// @is "$.index[*][?(@.name=='get_int_async')].inner.header.async" true -pub async fn get_int_async() -> i32 { - 42 -} - -// @is "$.index[*][?(@.name=='get_int_future')].inner.decl.output.kind" '"impl_trait"' -// @is "$.index[*][?(@.name=='get_int_future')].inner.decl.output.inner[0].trait_bound.trait.name" '"Future"' -// @is "$.index[*][?(@.name=='get_int_future')].inner.decl.output.inner[0].trait_bound.trait.args.angle_bracketed.bindings[0].name" '"Output"' -// @is "$.index[*][?(@.name=='get_int_future')].inner.decl.output.inner[0].trait_bound.trait.args.angle_bracketed.bindings[0].binding.equality.type" '{"inner": "i32", "kind": "primitive"}' -// @is "$.index[*][?(@.name=='get_int_future')].inner.header.async" false -pub fn get_int_future() -> impl Future<Output = i32> { - async { 42 } -} - -// @is "$.index[*][?(@.name=='get_int_future_async')].inner.decl.output.kind" '"impl_trait"' -// @is "$.index[*][?(@.name=='get_int_future_async')].inner.decl.output.inner[0].trait_bound.trait.name" '"Future"' -// @is "$.index[*][?(@.name=='get_int_future_async')].inner.decl.output.inner[0].trait_bound.trait.args.angle_bracketed.bindings[0].name" '"Output"' -// @is "$.index[*][?(@.name=='get_int_future_async')].inner.decl.output.inner[0].trait_bound.trait.args.angle_bracketed.bindings[0].binding.equality.type" '{"inner": "i32", "kind": "primitive"}' -// @is "$.index[*][?(@.name=='get_int_future_async')].inner.header.async" true -pub async fn get_int_future_async() -> impl Future<Output = i32> { - async { 42 } -} diff --git a/src/test/rustdoc-json/fns/generic_args.rs b/src/test/rustdoc-json/fns/generic_args.rs deleted file mode 100644 index eec295efe..000000000 --- a/src/test/rustdoc-json/fns/generic_args.rs +++ /dev/null @@ -1,71 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @set foo = "$.index[*][?(@.name=='Foo')].id" -pub trait Foo {} - -// @set generic_foo = "$.index[*][?(@.name=='GenericFoo')].id" -pub trait GenericFoo<'a> {} - -// @is "$.index[*][?(@.name=='generics')].inner.generics.where_predicates" "[]" -// @count "$.index[*][?(@.name=='generics')].inner.generics.params[*]" 1 -// @is "$.index[*][?(@.name=='generics')].inner.generics.params[0].name" '"F"' -// @is "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.default" 'null' -// @count "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[*]" 1 -// @is "$.index[*][?(@.name=='generics')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" '$foo' -// @count "$.index[*][?(@.name=='generics')].inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][0]" '"f"' -// @is "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].kind" '"generic"' -// @is "$.index[*][?(@.name=='generics')].inner.decl.inputs[0][1].inner" '"F"' -pub fn generics<F: Foo>(f: F) {} - -// @is "$.index[*][?(@.name=='impl_trait')].inner.generics.where_predicates" "[]" -// @count "$.index[*][?(@.name=='impl_trait')].inner.generics.params[*]" 1 -// @is "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].name" '"impl Foo"' -// @is "$.index[*][?(@.name=='impl_trait')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" $foo -// @count "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][0]" '"f"' -// @is "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].kind" '"impl_trait"' -// @count "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[*]" 1 -// @is "$.index[*][?(@.name=='impl_trait')].inner.decl.inputs[0][1].inner[0].trait_bound.trait.id" $foo -pub fn impl_trait(f: impl Foo) {} - -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.params[*]" 3 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].name" '"F"' -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.params[0].kind" '{"type": {"bounds": [], "default": null, "synthetic": false}}' -// @count "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[*]" 3 -// @is "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][0]" '"f"' -// @is "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][1].kind" '"generic"' -// @is "$.index[*][?(@.name=='where_clase')].inner.decl.inputs[0][1].inner" '"F"' -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[*]" 3 - -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.type" '{"inner": "F", "kind": "generic"}' -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.bounds[*]" 1 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[0].bound_predicate.bounds[0].trait_bound.trait.id" $foo - -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.type" '{"inner": "G", "kind": "generic"}' -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[*]" 1 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.trait.id" $generic_foo -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[*]" 1 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[0].name" \"\'a\" -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.bounds[0].trait_bound.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }' -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[1].bound_predicate.generic_params" "[]" - -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.type.kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.type.inner.lifetime" \"\'b\" -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.type.inner.type" '{"inner": "H", "kind": "generic"}' -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.bounds[*]" 1 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.bounds[0].trait_bound.trait.id" $foo -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.bounds[0].trait_bound.generic_params" "[]" -// @count "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[*]" 1 -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[0].name" \"\'b\" -// @is "$.index[*][?(@.name=='where_clase')].inner.generics.where_predicates[2].bound_predicate.generic_params[0].kind" '{ "lifetime": { "outlives": [] } }' -pub fn where_clase<F, G, H>(f: F, g: G, h: H) -where - F: Foo, - G: for<'a> GenericFoo<'a>, - for<'b> &'b H: Foo, -{ -} diff --git a/src/test/rustdoc-json/fns/generic_returns.rs b/src/test/rustdoc-json/fns/generic_returns.rs deleted file mode 100644 index a9bc2d5d7..000000000 --- a/src/test/rustdoc-json/fns/generic_returns.rs +++ /dev/null @@ -1,21 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @count "$.index[*][?(@.name=='generic_returns')].inner.items[*]" 2 - -// @set foo = "$.index[*][?(@.name=='Foo')].id" -pub trait Foo {} - -// @is "$.index[*][?(@.name=='get_foo')].inner.decl.inputs" [] -// @is "$.index[*][?(@.name=='get_foo')].inner.decl.output.kind" '"impl_trait"' -// @count "$.index[*][?(@.name=='get_foo')].inner.decl.output.inner[*]" 1 -// @is "$.index[*][?(@.name=='get_foo')].inner.decl.output.inner[0].trait_bound.trait.id" $foo -pub fn get_foo() -> impl Foo { - Fooer {} -} - -struct Fooer {} - -impl Foo for Fooer {} diff --git a/src/test/rustdoc-json/fns/generics.rs b/src/test/rustdoc-json/fns/generics.rs deleted file mode 100644 index 7b70ff1df..000000000 --- a/src/test/rustdoc-json/fns/generics.rs +++ /dev/null @@ -1,26 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @set wham_id = "$.index[*][?(@.name=='Wham')].id" -pub trait Wham {} - -// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.where_predicates" [] -// @count "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[*]" 1 -// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].name" '"T"' -// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" false -// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" $wham_id -// @is "$.index[*][?(@.name=='one_generic_param_fn')].inner.decl.inputs" '[["w", {"inner": "T", "kind": "generic"}]]' -pub fn one_generic_param_fn<T: Wham>(w: T) {} - -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.where_predicates" [] -// @count "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[*]" 1 -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].name" '"impl Wham"' -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.synthetic" true -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.generics.params[0].kind.type.bounds[0].trait_bound.trait.id" $wham_id -// @count "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][0]" '"w"' -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][1].kind" '"impl_trait"' -// @is "$.index[*][?(@.name=='one_synthetic_generic_param_fn')].inner.decl.inputs[0][1].inner[0].trait_bound.trait.id" $wham_id -pub fn one_synthetic_generic_param_fn(w: impl Wham) {} diff --git a/src/test/rustdoc-json/fns/pattern_arg.rs b/src/test/rustdoc-json/fns/pattern_arg.rs deleted file mode 100644 index 32b7da0fa..000000000 --- a/src/test/rustdoc-json/fns/pattern_arg.rs +++ /dev/null @@ -1,7 +0,0 @@ -// @is "$.index[*][?(@.name=='fst')].inner.decl.inputs[0][0]" '"(x, _)"' -pub fn fst<X, Y>((x, _): (X, Y)) -> X { - x -} - -// @is "$.index[*][?(@.name=='drop_int')].inner.decl.inputs[0][0]" '"_"' -pub fn drop_int(_: i32) {} diff --git a/src/test/rustdoc-json/fns/qualifiers.rs b/src/test/rustdoc-json/fns/qualifiers.rs deleted file mode 100644 index 7ff542900..000000000 --- a/src/test/rustdoc-json/fns/qualifiers.rs +++ /dev/null @@ -1,33 +0,0 @@ -// edition:2018 - -// @is "$.index[*][?(@.name=='nothing_fn')].inner.header.async" false -// @is "$.index[*][?(@.name=='nothing_fn')].inner.header.const" false -// @is "$.index[*][?(@.name=='nothing_fn')].inner.header.unsafe" false -pub fn nothing_fn() {} - -// @is "$.index[*][?(@.name=='unsafe_fn')].inner.header.async" false -// @is "$.index[*][?(@.name=='unsafe_fn')].inner.header.const" false -// @is "$.index[*][?(@.name=='unsafe_fn')].inner.header.unsafe" true -pub unsafe fn unsafe_fn() {} - -// @is "$.index[*][?(@.name=='const_fn')].inner.header.async" false -// @is "$.index[*][?(@.name=='const_fn')].inner.header.const" true -// @is "$.index[*][?(@.name=='const_fn')].inner.header.unsafe" false -pub const fn const_fn() {} - -// @is "$.index[*][?(@.name=='async_fn')].inner.header.async" true -// @is "$.index[*][?(@.name=='async_fn')].inner.header.const" false -// @is "$.index[*][?(@.name=='async_fn')].inner.header.unsafe" false -pub async fn async_fn() {} - -// @is "$.index[*][?(@.name=='async_unsafe_fn')].inner.header.async" true -// @is "$.index[*][?(@.name=='async_unsafe_fn')].inner.header.const" false -// @is "$.index[*][?(@.name=='async_unsafe_fn')].inner.header.unsafe" true -pub async unsafe fn async_unsafe_fn() {} - -// @is "$.index[*][?(@.name=='const_unsafe_fn')].inner.header.async" false -// @is "$.index[*][?(@.name=='const_unsafe_fn')].inner.header.const" true -// @is "$.index[*][?(@.name=='const_unsafe_fn')].inner.header.unsafe" true -pub const unsafe fn const_unsafe_fn() {} - -// It's impossible for a function to be both const and async, so no test for that diff --git a/src/test/rustdoc-json/fns/return_type_alias.rs b/src/test/rustdoc-json/fns/return_type_alias.rs deleted file mode 100644 index 2578bb49a..000000000 --- a/src/test/rustdoc-json/fns/return_type_alias.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/104851> - -/// @set foo = "$.index[*][?(@.name=='Foo')].id" -pub type Foo = i32; - -// @is "$.index[*][?(@.name=='demo')].inner.decl.output.kind" '"resolved_path"' -// @is "$.index[*][?(@.name=='demo')].inner.decl.output.inner.id" $foo -pub fn demo() -> Foo { - 42 -} diff --git a/src/test/rustdoc-json/generic-associated-types/gats.rs b/src/test/rustdoc-json/generic-associated-types/gats.rs deleted file mode 100644 index e5809783a..000000000 --- a/src/test/rustdoc-json/generic-associated-types/gats.rs +++ /dev/null @@ -1,42 +0,0 @@ -// ignore-tidy-linelength - -#![no_core] -#![feature(lang_items, no_core)] - -#[lang = "sized"] -pub trait Sized {} - -pub trait Display {} - -pub trait LendingIterator { - // @count "$.index[*][?(@.name=='LendingItem')].inner.generics.params[*]" 1 - // @is "$.index[*][?(@.name=='LendingItem')].inner.generics.params[*].name" \"\'a\" - // @count "$.index[*][?(@.name=='LendingItem')].inner.generics.where_predicates[*]" 1 - // @is "$.index[*][?(@.name=='LendingItem')].inner.generics.where_predicates[*].bound_predicate.type.inner" \"Self\" - // @is "$.index[*][?(@.name=='LendingItem')].inner.generics.where_predicates[*].bound_predicate.bounds[*].outlives" \"\'a\" - // @count "$.index[*][?(@.name=='LendingItem')].inner.bounds[*]" 1 - type LendingItem<'a>: Display - where - Self: 'a; - - // @is "$.index[*][?(@.name=='lending_next')].inner.decl.output.kind" \"qualified_path\" - // @count "$.index[*][?(@.name=='lending_next')].inner.decl.output.inner.args.angle_bracketed.args[*]" 1 - // @count "$.index[*][?(@.name=='lending_next')].inner.decl.output.inner.args.angle_bracketed.bindings[*]" 0 - // @is "$.index[*][?(@.name=='lending_next')].inner.decl.output.inner.self_type.inner" \"Self\" - // @is "$.index[*][?(@.name=='lending_next')].inner.decl.output.inner.name" \"LendingItem\" - fn lending_next<'a>(&'a self) -> Self::LendingItem<'a>; -} - -pub trait Iterator { - // @count "$.index[*][?(@.name=='Item')].inner.generics.params[*]" 0 - // @count "$.index[*][?(@.name=='Item')].inner.generics.where_predicates[*]" 0 - // @count "$.index[*][?(@.name=='Item')].inner.bounds[*]" 1 - type Item: Display; - - // @is "$.index[*][?(@.name=='next')].inner.decl.output.kind" \"qualified_path\" - // @count "$.index[*][?(@.name=='next')].inner.decl.output.inner.args.angle_bracketed.args[*]" 0 - // @count "$.index[*][?(@.name=='next')].inner.decl.output.inner.args.angle_bracketed.bindings[*]" 0 - // @is "$.index[*][?(@.name=='next')].inner.decl.output.inner.self_type.inner" \"Self\" - // @is "$.index[*][?(@.name=='next')].inner.decl.output.inner.name" \"Item\" - fn next<'a>(&'a self) -> Self::Item; -} diff --git a/src/test/rustdoc-json/generic_impl.rs b/src/test/rustdoc-json/generic_impl.rs deleted file mode 100644 index 31f41d0f3..000000000 --- a/src/test/rustdoc-json/generic_impl.rs +++ /dev/null @@ -1,23 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/97986>. - -// @has "$.index[*][?(@.name=='f')]" -// @has "$.index[*][?(@.name=='AssocTy')]" -// @has "$.index[*][?(@.name=='AssocConst')]" - -pub mod m { - pub struct S; -} - -pub trait F { - type AssocTy; - const AssocConst: usize; - fn f() -> m::S; -} - -impl<T> F for T { - type AssocTy = u32; - const AssocConst: usize = 0; - fn f() -> m::S { - m::S - } -} diff --git a/src/test/rustdoc-json/glob_import.rs b/src/test/rustdoc-json/glob_import.rs deleted file mode 100644 index 00051b121..000000000 --- a/src/test/rustdoc-json/glob_import.rs +++ /dev/null @@ -1,23 +0,0 @@ -// This is a regression test for <https://github.com/rust-lang/rust/issues/98003>. - -#![feature(no_core)] -#![no_std] -#![no_core] - -// @has "$.index[*][?(@.name=='glob')]" -// @has "$.index[*][?(@.kind=='import')].inner.name" \"*\" - - -mod m1 { - pub fn f() {} -} -mod m2 { - pub fn f(_: u8) {} -} - -pub use m1::*; -pub use m2::*; - -pub mod glob { - pub use *; -} diff --git a/src/test/rustdoc-json/impls/auto.rs b/src/test/rustdoc-json/impls/auto.rs deleted file mode 100644 index 50d852414..000000000 --- a/src/test/rustdoc-json/impls/auto.rs +++ /dev/null @@ -1,18 +0,0 @@ -#![feature(no_core, auto_traits, lang_items)] -#![no_core] - -#[lang = "sized"] -trait Sized {} - -pub auto trait Bar {} - -/// has span -impl Foo { - pub fn baz(&self) {} -} - -// Testing spans, so all tests below code -// @is "$.index[*][?(@.kind=='impl' && @.inner.synthetic==true)].span" null -// @is "$.index[*][?(@.docs=='has span')].span.begin" "[10, 0]" -// @is "$.index[*][?(@.docs=='has span')].span.end" "[12, 1]" -pub struct Foo; diff --git a/src/test/rustdoc-json/impls/auxiliary/foreign_struct.rs b/src/test/rustdoc-json/impls/auxiliary/foreign_struct.rs deleted file mode 100644 index 832d0fce5..000000000 --- a/src/test/rustdoc-json/impls/auxiliary/foreign_struct.rs +++ /dev/null @@ -1 +0,0 @@ -pub struct ForeignStruct; diff --git a/src/test/rustdoc-json/impls/auxiliary/foreign_trait.rs b/src/test/rustdoc-json/impls/auxiliary/foreign_trait.rs deleted file mode 100644 index 2c81bee61..000000000 --- a/src/test/rustdoc-json/impls/auxiliary/foreign_trait.rs +++ /dev/null @@ -1 +0,0 @@ -pub trait ForeignTrait {} diff --git a/src/test/rustdoc-json/impls/blanket_with_local.rs b/src/test/rustdoc-json/impls/blanket_with_local.rs deleted file mode 100644 index 2fb4a84b9..000000000 --- a/src/test/rustdoc-json/impls/blanket_with_local.rs +++ /dev/null @@ -1,18 +0,0 @@ -// Test for the ICE in rust/83718 -// A blanket impl plus a local type together shouldn't result in mismatched ID issues - -// @has "$.index[*][?(@.name=='Load')]" -pub trait Load { - // @has "$.index[*][?(@.name=='load')]" - fn load() {} - // @has "$.index[*][?(@.name=='write')]" - fn write(self) {} -} - -impl<P> Load for P { - fn load() {} - fn write(self) {} -} - -// @has "$.index[*][?(@.name=='Wrapper')]" -pub struct Wrapper {} diff --git a/src/test/rustdoc-json/impls/foreign_for_local.rs b/src/test/rustdoc-json/impls/foreign_for_local.rs deleted file mode 100644 index 290c2d571..000000000 --- a/src/test/rustdoc-json/impls/foreign_for_local.rs +++ /dev/null @@ -1,18 +0,0 @@ -// aux-build: foreign_trait.rs -extern crate foreign_trait; - -/// ForeignTrait id hack -pub use foreign_trait::ForeignTrait as _; -// @set ForeignTrait = "$.index[*][?(@.docs=='ForeignTrait id hack')].inner.id" - -pub struct LocalStruct; -// @set LocalStruct = "$.index[*][?(@.name=='LocalStruct')].id" - -/// foreign for local -impl foreign_trait::ForeignTrait for LocalStruct {} - -// @set impl = "$.index[*][?(@.docs=='foreign for local')].id" -// @is "$.index[*][?(@.docs=='foreign for local')].inner.for.inner.id" $LocalStruct -// @is "$.index[*][?(@.docs=='foreign for local')].inner.trait.id" $ForeignTrait - -// @has "$.index[*][?(@.name=='LocalStruct')].inner.impls[*]" $impl diff --git a/src/test/rustdoc-json/impls/import_from_private.rs b/src/test/rustdoc-json/impls/import_from_private.rs deleted file mode 100644 index fa88b6113..000000000 --- a/src/test/rustdoc-json/impls/import_from_private.rs +++ /dev/null @@ -1,22 +0,0 @@ -// https://github.com/rust-lang/rust/issues/100252 - -#![feature(no_core)] -#![no_core] - -mod bar { - // @set baz = "$.index[*][?(@.kind=='struct')].id" - pub struct Baz; - // @set impl = "$.index[*][?(@.kind=='impl')].id" - impl Baz { - // @set doit = "$.index[*][?(@.kind=='function')].id" - pub fn doit() {} - } -} - -// @set import = "$.index[*][?(@.kind=='import')].id" -pub use bar::Baz; - -// @is "$.index[*][?(@.kind=='module')].inner.items[*]" $import -// @is "$.index[*][?(@.kind=='import')].inner.id" $baz -// @is "$.index[*][?(@.kind=='struct')].inner.impls[*]" $impl -// @is "$.index[*][?(@.kind=='impl')].inner.items[*]" $doit diff --git a/src/test/rustdoc-json/impls/local_for_foreign.rs b/src/test/rustdoc-json/impls/local_for_foreign.rs deleted file mode 100644 index 74f2f08b5..000000000 --- a/src/test/rustdoc-json/impls/local_for_foreign.rs +++ /dev/null @@ -1,18 +0,0 @@ -// aux-build: foreign_struct.rs -extern crate foreign_struct; - -/// ForeignStruct id hack -pub use foreign_struct::ForeignStruct as _; -// @set ForeignStruct = "$.index[*][?(@.docs=='ForeignStruct id hack')].inner.id" - -pub trait LocalTrait {} -// @set LocalTrait = "$.index[*][?(@.name=='LocalTrait')].id" - -/// local for foreign -impl LocalTrait for foreign_struct::ForeignStruct {} - -// @set impl = "$.index[*][?(@.docs=='local for foreign')].id" -// @is "$.index[*][?(@.docs=='local for foreign')].inner.trait.id" $LocalTrait -// @is "$.index[*][?(@.docs=='local for foreign')].inner.for.inner.id" $ForeignStruct - -// @is "$.index[*][?(@.name=='LocalTrait')].inner.implementations[*]" $impl diff --git a/src/test/rustdoc-json/impls/local_for_local.rs b/src/test/rustdoc-json/impls/local_for_local.rs deleted file mode 100644 index 93dedb7ec..000000000 --- a/src/test/rustdoc-json/impls/local_for_local.rs +++ /dev/null @@ -1,15 +0,0 @@ -#![feature(no_core)] -#![no_core] - -// @set struct = "$.index[*][?(@.name=='Struct')].id" -pub struct Struct; -// @set trait = "$.index[*][?(@.name=='Trait')].id" -pub trait Trait {} -// @set impl = "$.index[*][?(@.docs=='impl')].id" -/// impl -impl Trait for Struct {} - -// @is "$.index[*][?(@.name=='Struct')].inner.impls[*]" $impl -// @is "$.index[*][?(@.name=='Trait')].inner.implementations[*]" $impl -// @is "$.index[*][?(@.docs=='impl')].inner.trait.id" $trait -// @is "$.index[*][?(@.docs=='impl')].inner.for.inner.id" $struct diff --git a/src/test/rustdoc-json/impls/local_for_local_primitive.rs b/src/test/rustdoc-json/impls/local_for_local_primitive.rs deleted file mode 100644 index 38e7e2658..000000000 --- a/src/test/rustdoc-json/impls/local_for_local_primitive.rs +++ /dev/null @@ -1,21 +0,0 @@ -#![feature(no_core)] -#![feature(rustdoc_internals)] -#![no_core] - -// @set Local = "$.index[*][?(@.name=='Local')].id" -pub trait Local {} - -// @is "$.index[*][?(@.docs=='Local for bool')].inner.trait.id" $Local -// @is "$.index[*][?(@.docs=='Local for bool')].inner.for.kind" '"primitive"' -// @is "$.index[*][?(@.docs=='Local for bool')].inner.for.inner" '"bool"' -/// Local for bool -impl Local for bool {} - -// @set impl = "$.index[*][?(@.docs=='Local for bool')].id" -// @is "$.index[*][?(@.name=='Local')].inner.implementations[*]" $impl - -// FIXME(#101695): Test bool's `impls` include "Local for bool" -// @has "$.index[*][?(@.name=='bool')]" -#[doc(primitive = "bool")] -/// Boolean docs -mod prim_bool {} diff --git a/src/test/rustdoc-json/impls/local_for_primitive.rs b/src/test/rustdoc-json/impls/local_for_primitive.rs deleted file mode 100644 index 7702a526f..000000000 --- a/src/test/rustdoc-json/impls/local_for_primitive.rs +++ /dev/null @@ -1,7 +0,0 @@ -// @set local = "$.index[*][?(@.name=='Local')]" -pub trait Local {} - -// @set impl = "$.index[*][?(@.docs=='local for bool')].id" -// @is "$.index[*][?(@.name=='Local')].inner.implementations[*]" $impl -/// local for bool -impl Local for bool {} 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 diff --git a/src/test/rustdoc-json/keyword.rs b/src/test/rustdoc-json/keyword.rs deleted file mode 100644 index 3446b212c..000000000 --- a/src/test/rustdoc-json/keyword.rs +++ /dev/null @@ -1,20 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/98002>. - -// Keywords should not be generated in rustdoc JSON output and this test -// ensures it. - -#![feature(rustdoc_internals)] -#![no_std] - -// @!has "$.index[*][?(@.name=='match')]" -// @has "$.index[*][?(@.name=='foo')]" - -#[doc(keyword = "match")] -/// this is a test! -pub mod foo {} - -// @!has "$.index[*][?(@.name=='hello')]" -// @!has "$.index[*][?(@.name=='bar')]" -#[doc(keyword = "hello")] -/// hello -mod bar {} diff --git a/src/test/rustdoc-json/lifetime/longest.rs b/src/test/rustdoc-json/lifetime/longest.rs deleted file mode 100644 index 326dab8e5..000000000 --- a/src/test/rustdoc-json/lifetime/longest.rs +++ /dev/null @@ -1,33 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @is "$.index[*][?(@.name=='longest')].inner.generics.params[0].name" \"\'a\" -// @is "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '{"lifetime": {"outlives": []}}' -// @is "$.index[*][?(@.name=='longest')].inner.generics.params[0].kind" '{"lifetime": {"outlives": []}}' -// @count "$.index[*][?(@.name=='longest')].inner.generics.params[*]" 1 -// @is "$.index[*][?(@.name=='longest')].inner.generics.where_predicates" [] - -// @count "$.index[*][?(@.name=='longest')].inner.decl.inputs[*]" 2 -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][0]" '"l"' -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][0]" '"r"' - -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.mutable" false -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[0][1].inner.type" '{"inner": "str", "kind": "primitive"}' - -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.mutable" false -// @is "$.index[*][?(@.name=='longest')].inner.decl.inputs[1][1].inner.type" '{"inner": "str", "kind": "primitive"}' - -// @is "$.index[*][?(@.name=='longest')].inner.decl.output.kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='longest')].inner.decl.output.inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='longest')].inner.decl.output.inner.mutable" false -// @is "$.index[*][?(@.name=='longest')].inner.decl.output.inner.type" '{"inner": "str", "kind": "primitive"}' - -pub fn longest<'a>(l: &'a str, r: &'a str) -> &'a str { - if l.len() > r.len() { l } else { r } -} diff --git a/src/test/rustdoc-json/lifetime/outlives.rs b/src/test/rustdoc-json/lifetime/outlives.rs deleted file mode 100644 index e15a533ef..000000000 --- a/src/test/rustdoc-json/lifetime/outlives.rs +++ /dev/null @@ -1,23 +0,0 @@ -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -// @count "$.index[*][?(@.name=='foo')].inner.generics.params[*]" 3 -// @is "$.index[*][?(@.name=='foo')].inner.generics.where_predicates" [] -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[0].name" \"\'a\" -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[1].name" \"\'b\" -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[2].name" '"T"' -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[0].kind.lifetime.outlives" [] -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[1].kind.lifetime.outlives" [\"\'a\"] -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.default" null -// @count "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.bounds[*]" 1 -// @is "$.index[*][?(@.name=='foo')].inner.generics.params[2].kind.type.bounds[0].outlives" \"\'b\" -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.mutable" false -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.lifetime" \"\'b\" -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.mutable" false -// @is "$.index[*][?(@.name=='foo')].inner.decl.inputs[0][1].inner.type.inner.type" '{"inner": "T", "kind": "generic"}' -pub fn foo<'a, 'b: 'a, T: 'b>(_: &'a &'b T) {} diff --git a/src/test/rustdoc-json/methods/abi.rs b/src/test/rustdoc-json/methods/abi.rs deleted file mode 100644 index 4c97d97ce..000000000 --- a/src/test/rustdoc-json/methods/abi.rs +++ /dev/null @@ -1,55 +0,0 @@ -// ignore-tidy-linelength - -#![feature(abi_vectorcall)] -#![feature(c_unwind)] -#![feature(no_core)] -#![no_core] - -// @has "$.index[*][?(@.name=='Foo')]" -pub struct Foo; - -impl Foo { - // @is "$.index[*][?(@.name=='abi_rust')].inner.header.abi" \"Rust\" - pub fn abi_rust() {} - - // @is "$.index[*][?(@.name=='abi_c')].inner.header.abi" '{"C": {"unwind": false}}' - pub extern "C" fn abi_c() {} - - // @is "$.index[*][?(@.name=='abi_system')].inner.header.abi" '{"System": {"unwind": false}}' - pub extern "system" fn abi_system() {} - - // @is "$.index[*][?(@.name=='abi_c_unwind')].inner.header.abi" '{"C": {"unwind": true}}' - pub extern "C-unwind" fn abi_c_unwind() {} - - // @is "$.index[*][?(@.name=='abi_system_unwind')].inner.header.abi" '{"System": {"unwind": true}}' - pub extern "system-unwind" fn abi_system_unwind() {} - - // @is "$.index[*][?(@.name=='abi_vectorcall')].inner.header.abi.Other" '"\"vectorcall\""' - pub extern "vectorcall" fn abi_vectorcall() {} - - // @is "$.index[*][?(@.name=='abi_vectorcall_unwind')].inner.header.abi.Other" '"\"vectorcall-unwind\""' - pub extern "vectorcall-unwind" fn abi_vectorcall_unwind() {} -} - -pub trait Bar { - // @is "$.index[*][?(@.name=='trait_abi_rust')].inner.header.abi" \"Rust\" - fn trait_abi_rust() {} - - // @is "$.index[*][?(@.name=='trait_abi_c')].inner.header.abi" '{"C": {"unwind": false}}' - extern "C" fn trait_abi_c() {} - - // @is "$.index[*][?(@.name=='trait_abi_system')].inner.header.abi" '{"System": {"unwind": false}}' - extern "system" fn trait_abi_system() {} - - // @is "$.index[*][?(@.name=='trait_abi_c_unwind')].inner.header.abi" '{"C": {"unwind": true}}' - extern "C-unwind" fn trait_abi_c_unwind() {} - - // @is "$.index[*][?(@.name=='trait_abi_system_unwind')].inner.header.abi" '{"System": {"unwind": true}}' - extern "system-unwind" fn trait_abi_system_unwind() {} - - // @is "$.index[*][?(@.name=='trait_abi_vectorcall')].inner.header.abi.Other" '"\"vectorcall\""' - extern "vectorcall" fn trait_abi_vectorcall() {} - - // @is "$.index[*][?(@.name=='trait_abi_vectorcall_unwind')].inner.header.abi.Other" '"\"vectorcall-unwind\""' - extern "vectorcall-unwind" fn trait_abi_vectorcall_unwind() {} -} diff --git a/src/test/rustdoc-json/methods/qualifiers.rs b/src/test/rustdoc-json/methods/qualifiers.rs deleted file mode 100644 index b9a5e5601..000000000 --- a/src/test/rustdoc-json/methods/qualifiers.rs +++ /dev/null @@ -1,37 +0,0 @@ -// edition:2018 - -pub struct Foo; - -impl Foo { - // @is "$.index[*][?(@.name=='const_meth')].inner.header.async" false - // @is "$.index[*][?(@.name=='const_meth')].inner.header.const" true - // @is "$.index[*][?(@.name=='const_meth')].inner.header.unsafe" false - pub const fn const_meth() {} - - // @is "$.index[*][?(@.name=='nothing_meth')].inner.header.async" false - // @is "$.index[*][?(@.name=='nothing_meth')].inner.header.const" false - // @is "$.index[*][?(@.name=='nothing_meth')].inner.header.unsafe" false - pub fn nothing_meth() {} - - // @is "$.index[*][?(@.name=='unsafe_meth')].inner.header.async" false - // @is "$.index[*][?(@.name=='unsafe_meth')].inner.header.const" false - // @is "$.index[*][?(@.name=='unsafe_meth')].inner.header.unsafe" true - pub unsafe fn unsafe_meth() {} - - // @is "$.index[*][?(@.name=='async_meth')].inner.header.async" true - // @is "$.index[*][?(@.name=='async_meth')].inner.header.const" false - // @is "$.index[*][?(@.name=='async_meth')].inner.header.unsafe" false - pub async fn async_meth() {} - - // @is "$.index[*][?(@.name=='async_unsafe_meth')].inner.header.async" true - // @is "$.index[*][?(@.name=='async_unsafe_meth')].inner.header.const" false - // @is "$.index[*][?(@.name=='async_unsafe_meth')].inner.header.unsafe" true - pub async unsafe fn async_unsafe_meth() {} - - // @is "$.index[*][?(@.name=='const_unsafe_meth')].inner.header.async" false - // @is "$.index[*][?(@.name=='const_unsafe_meth')].inner.header.const" true - // @is "$.index[*][?(@.name=='const_unsafe_meth')].inner.header.unsafe" true - pub const unsafe fn const_unsafe_meth() {} - - // It's impossible for a method to be both const and async, so no test for that -} diff --git a/src/test/rustdoc-json/nested.rs b/src/test/rustdoc-json/nested.rs deleted file mode 100644 index ee2d2efa9..000000000 --- a/src/test/rustdoc-json/nested.rs +++ /dev/null @@ -1,31 +0,0 @@ -// edition:2018 -// compile-flags: --crate-version 1.0.0 - -// @is "$.crate_version" \"1.0.0\" -// @is "$.index[*][?(@.name=='nested')].kind" \"module\" -// @is "$.index[*][?(@.name=='nested')].inner.is_crate" true - -// @set l1_id = "$.index[*][?(@.name=='l1')].id" -// @ismany "$.index[*][?(@.name=='nested')].inner.items[*]" $l1_id - -// @is "$.index[*][?(@.name=='l1')].kind" \"module\" -// @is "$.index[*][?(@.name=='l1')].inner.is_crate" false -pub mod l1 { - // @is "$.index[*][?(@.name=='l3')].kind" \"module\" - // @is "$.index[*][?(@.name=='l3')].inner.is_crate" false - // @set l3_id = "$.index[*][?(@.name=='l3')].id" - pub mod l3 { - - // @is "$.index[*][?(@.name=='L4')].kind" \"struct\" - // @is "$.index[*][?(@.name=='L4')].inner.kind" \"unit\" - // @set l4_id = "$.index[*][?(@.name=='L4')].id" - // @ismany "$.index[*][?(@.name=='l3')].inner.items[*]" $l4_id - pub struct L4; - } - // @is "$.index[*][?(@.inner.source=='l3::L4')].kind" \"import\" - // @is "$.index[*][?(@.inner.source=='l3::L4')].inner.glob" false - // @is "$.index[*][?(@.inner.source=='l3::L4')].inner.id" $l4_id - // @set l4_use_id = "$.index[*][?(@.inner.source=='l3::L4')].id" - pub use l3::L4; -} -// @ismany "$.index[*][?(@.name=='l1')].inner.items[*]" $l3_id $l4_use_id diff --git a/src/test/rustdoc-json/output_generics.rs b/src/test/rustdoc-json/output_generics.rs deleted file mode 100644 index 04b1a358f..000000000 --- a/src/test/rustdoc-json/output_generics.rs +++ /dev/null @@ -1,37 +0,0 @@ -// compile-flags: --document-private-items --document-hidden-items - -// This is a regression test for #98009. - -// @has "$.index[*][?(@.name=='this_compiles')]" -// @has "$.index[*][?(@.name=='this_does_not')]" -// @has "$.index[*][?(@.name=='Events')]" -// @has "$.index[*][?(@.name=='Other')]" -// @has "$.index[*][?(@.name=='Trait')]" - -struct Events<R>(R); - -struct Other; - -pub trait Trait<T> { - fn handle(value: T) -> Self; -} - -impl<T, U> Trait<U> for T where T: From<U> { - fn handle(_: U) -> Self { unimplemented!() } -} - -impl<'a, R> Trait<&'a mut Events<R>> for Other { - fn handle(_: &'a mut Events<R>) -> Self { unimplemented!() } -} - -fn this_compiles<'a, R>(value: &'a mut Events<R>) { - for _ in 0..3 { - Other::handle(&mut *value); - } -} - -fn this_does_not<'a, R>(value: &'a mut Events<R>) { - for _ in 0..3 { - Other::handle(value); - } -} diff --git a/src/test/rustdoc-json/primitives/primitive_impls.rs b/src/test/rustdoc-json/primitives/primitive_impls.rs deleted file mode 100644 index 1fc937406..000000000 --- a/src/test/rustdoc-json/primitives/primitive_impls.rs +++ /dev/null @@ -1,34 +0,0 @@ -#![feature(no_core)] -#![feature(rustc_attrs)] -#![feature(rustdoc_internals)] -#![no_core] -#![rustc_coherence_is_core] - -// @set impl_i32 = "$.index[*][?(@.docs=='Only core can do this')].id" - -/// Only core can do this -impl i32 { - // @set identity = "$.index[*][?(@.docs=='Do Nothing')].id" - - /// Do Nothing - pub fn identity(self) -> Self { - self - } - - // @is "$.index[*][?(@.docs=='Only core can do this')].inner.items[*]" $identity -} - -// @set Trait = "$.index[*][?(@.name=='Trait')].id" -pub trait Trait {} -// @set impl_trait_for_i32 = "$.index[*][?(@.docs=='impl Trait for i32')].id" -/// impl Trait for i32 -impl Trait for i32 {} - -/// i32 -#[doc(primitive = "i32")] -mod prim_i32 {} - -// @set i32 = "$.index[*][?(@.docs=='i32')].id" -// @is "$.index[*][?(@.docs=='i32')].name" '"i32"' -// @is "$.index[*][?(@.docs=='i32')].inner.name" '"i32"' -// @ismany "$.index[*][?(@.docs=='i32')].inner.impls[*]" $impl_i32 $impl_trait_for_i32 diff --git a/src/test/rustdoc-json/primitives/primitive_overloading.rs b/src/test/rustdoc-json/primitives/primitive_overloading.rs deleted file mode 100644 index 56b35cd14..000000000 --- a/src/test/rustdoc-json/primitives/primitive_overloading.rs +++ /dev/null @@ -1,16 +0,0 @@ -// compile-flags: --document-private-items - -// Regression test for <https://github.com/rust-lang/rust/issues/98006>. - -#![feature(rustdoc_internals)] -#![feature(no_core)] - -#![no_core] - -// @has "$.index[*][?(@.name=='usize')]" -// @has "$.index[*][?(@.name=='prim')]" - -#[doc(primitive = "usize")] -/// This is the built-in type `usize`. -mod prim { -} diff --git a/src/test/rustdoc-json/primitives/primitive_type.rs b/src/test/rustdoc-json/primitives/primitive_type.rs deleted file mode 100644 index 8024044bc..000000000 --- a/src/test/rustdoc-json/primitives/primitive_type.rs +++ /dev/null @@ -1,22 +0,0 @@ -#![feature(never_type)] - -// @is "$.index[*][?(@.name=='PrimNever')].visibility" \"public\" -// @is "$.index[*][?(@.name=='PrimNever')].inner.type.kind" \"primitive\" -// @is "$.index[*][?(@.name=='PrimNever')].inner.type.inner" \"never\" -pub type PrimNever = !; - -// @is "$.index[*][?(@.name=='PrimStr')].inner.type.kind" \"primitive\" -// @is "$.index[*][?(@.name=='PrimStr')].inner.type.inner" \"str\" -pub type PrimStr = str; - -// @is "$.index[*][?(@.name=='PrimBool')].inner.type.kind" \"primitive\" -// @is "$.index[*][?(@.name=='PrimBool')].inner.type.inner" \"bool\" -pub type PrimBool = bool; - -// @is "$.index[*][?(@.name=='PrimChar')].inner.type.kind" \"primitive\" -// @is "$.index[*][?(@.name=='PrimChar')].inner.type.inner" \"char\" -pub type PrimChar = char; - -// @is "$.index[*][?(@.name=='PrimU8')].inner.type.kind" \"primitive\" -// @is "$.index[*][?(@.name=='PrimU8')].inner.type.inner" \"u8\" -pub type PrimU8 = u8; diff --git a/src/test/rustdoc-json/primitives/use_primitive.rs b/src/test/rustdoc-json/primitives/use_primitive.rs deleted file mode 100644 index e22927374..000000000 --- a/src/test/rustdoc-json/primitives/use_primitive.rs +++ /dev/null @@ -1,20 +0,0 @@ -// edition:2018 - -#![feature(rustdoc_internals)] - -#[doc(primitive = "usize")] -mod usize {} - -// @set local_crate_id = "$.index[*][?(@.name=='use_primitive')].crate_id" - -// @has "$.index[*][?(@.name=='ilog10')]" -// @!is "$.index[*][?(@.name=='ilog10')].crate_id" $local_crate_id -// @has "$.index[*][?(@.name=='checked_add')]" -// @!is "$.index[*][?(@.name=='checked_add')]" $local_crate_id -// @!has "$.index[*][?(@.name=='is_ascii_uppercase')]" - -// @is "$.index[*][?(@.kind=='import' && @.inner.name=='my_i32')].inner.id" null -pub use i32 as my_i32; - -// @is "$.index[*][?(@.kind=='import' && @.inner.name=='u32')].inner.id" null -pub use u32; diff --git a/src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs b/src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs deleted file mode 100644 index 4a835673a..000000000 --- a/src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs +++ /dev/null @@ -1 +0,0 @@ -pub struct Foo; diff --git a/src/test/rustdoc-json/reexport/auxiliary/trait_with_docs.rs b/src/test/rustdoc-json/reexport/auxiliary/trait_with_docs.rs deleted file mode 100644 index 1e87966b2..000000000 --- a/src/test/rustdoc-json/reexport/auxiliary/trait_with_docs.rs +++ /dev/null @@ -1,2 +0,0 @@ -/// The Docs -pub trait HasDocs {} diff --git a/src/test/rustdoc-json/reexport/export_extern_crate_as_self.rs b/src/test/rustdoc-json/reexport/export_extern_crate_as_self.rs deleted file mode 100644 index f076feb71..000000000 --- a/src/test/rustdoc-json/reexport/export_extern_crate_as_self.rs +++ /dev/null @@ -1,11 +0,0 @@ -//! Regression test for <https://github.com/rust-lang/rust/issues/100531> - -#![feature(no_core)] -#![no_core] - -#![crate_name = "export_extern_crate_as_self"] - -// ignore-tidy-linelength - -// @is "$.index[*][?(@.kind=='module')].name" \"export_extern_crate_as_self\" -pub extern crate self as export_extern_crate_as_self; // Must be the same name as the crate already has diff --git a/src/test/rustdoc-json/reexport/glob_collision.rs b/src/test/rustdoc-json/reexport/glob_collision.rs deleted file mode 100644 index f91144dbf..000000000 --- a/src/test/rustdoc-json/reexport/glob_collision.rs +++ /dev/null @@ -1,28 +0,0 @@ -// Regression test for https://github.com/rust-lang/rust/issues/100973 - -#![feature(no_core)] -#![no_core] - -// @set m1 = "$.index[*][?(@.name == 'm1' && @.kind == 'module')].id" -// @is "$.index[*][?(@.name == 'm1' && @.kind == 'module')].inner.items" [] -// @is "$.index[*][?(@.name == 'm1' && @.kind == 'module')].inner.is_stripped" true -mod m1 { - pub fn f() {} -} -// @set m2 = "$.index[*][?(@.name == 'm2' && @.kind == 'module')].id" -// @is "$.index[*][?(@.name == 'm2' && @.kind == 'module')].inner.items" [] -// @is "$.index[*][?(@.name == 'm2' && @.kind == 'module')].inner.is_stripped" true -mod m2 { - pub fn f(_: u8) {} -} - -// @set m1_use = "$.index[*][?(@.inner.name=='m1')].id" -// @is "$.index[*][?(@.inner.name=='m1')].inner.id" $m1 -// @is "$.index[*][?(@.inner.name=='m1')].inner.glob" true -pub use m1::*; -// @set m2_use = "$.index[*][?(@.inner.name=='m2')].id" -// @is "$.index[*][?(@.inner.name=='m2')].inner.id" $m2 -// @is "$.index[*][?(@.inner.name=='m2')].inner.glob" true -pub use m2::*; - -// @ismany "$.index[*][?(@.inner.is_crate==true)].inner.items[*]" $m1_use $m2_use diff --git a/src/test/rustdoc-json/reexport/glob_empty_mod.rs b/src/test/rustdoc-json/reexport/glob_empty_mod.rs deleted file mode 100644 index da6822835..000000000 --- a/src/test/rustdoc-json/reexport/glob_empty_mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -// Regression test for https://github.com/rust-lang/rust/issues/100973 - -// @is "$.index[*][?(@.name=='m1' && @.kind == 'module')].inner.is_stripped" true -// @set m1 = "$.index[*][?(@.name=='m1')].id" -mod m1 {} - -// @is "$.index[*][?(@.inner.name=='m1' && @.kind=='import')].inner.id" $m1 -pub use m1::*; diff --git a/src/test/rustdoc-json/reexport/glob_extern.rs b/src/test/rustdoc-json/reexport/glob_extern.rs deleted file mode 100644 index 7a1e8c11f..000000000 --- a/src/test/rustdoc-json/reexport/glob_extern.rs +++ /dev/null @@ -1,23 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @is "$.index[*][?(@.name=='mod1')].kind" \"module\" -// @is "$.index[*][?(@.name=='mod1')].inner.is_stripped" "true" -mod mod1 { - extern "C" { - // @set public_fn_id = "$.index[*][?(@.name=='public_fn')].id" - pub fn public_fn(); - // @!has "$.index[*][?(@.name=='private_fn')]" - fn private_fn(); - } - // @ismany "$.index[*][?(@.name=='mod1')].inner.items[*]" $public_fn_id - // @set mod1_id = "$.index[*][?(@.name=='mod1')].id" -} - -// @is "$.index[*][?(@.kind=='import')].inner.glob" true -// @is "$.index[*][?(@.kind=='import')].inner.id" $mod1_id -// @set use_id = "$.index[*][?(@.kind=='import')].id" -// @ismany "$.index[*][?(@.name=='glob_extern')].inner.items[*]" $use_id -pub use mod1::*; diff --git a/src/test/rustdoc-json/reexport/glob_private.rs b/src/test/rustdoc-json/reexport/glob_private.rs deleted file mode 100644 index 3a83a2081..000000000 --- a/src/test/rustdoc-json/reexport/glob_private.rs +++ /dev/null @@ -1,33 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @is "$.index[*][?(@.name=='mod1')].kind" \"module\" -// @is "$.index[*][?(@.name=='mod1')].inner.is_stripped" "true" -mod mod1 { - // @is "$.index[*][?(@.name=='mod2')].kind" \"module\" - // @is "$.index[*][?(@.name=='mod2')].inner.is_stripped" "true" - mod mod2 { - // @set m2pub_id = "$.index[*][?(@.name=='Mod2Public')].id" - pub struct Mod2Public; - - // @!has "$.index[*][?(@.name=='Mod2Private')]" - struct Mod2Private; - } - - // @set mod2_use_id = "$.index[*][?(@.kind=='import' && @.inner.name=='mod2')].id" - pub use self::mod2::*; - - // @set m1pub_id = "$.index[*][?(@.name=='Mod1Public')].id" - pub struct Mod1Public; - // @!has "$.index[*][?(@.name=='Mod1Private')]" - struct Mod1Private; -} - -// @set mod1_use_id = "$.index[*][?(@.kind=='import' && @.inner.name=='mod1')].id" -pub use mod1::*; - -// @ismany "$.index[*][?(@.name=='mod2')].inner.items[*]" $m2pub_id -// @ismany "$.index[*][?(@.name=='mod1')].inner.items[*]" $m1pub_id $mod2_use_id -// @ismany "$.index[*][?(@.name=='glob_private')].inner.items[*]" $mod1_use_id diff --git a/src/test/rustdoc-json/reexport/in_root_and_mod.rs b/src/test/rustdoc-json/reexport/in_root_and_mod.rs deleted file mode 100644 index 7b97ebf21..000000000 --- a/src/test/rustdoc-json/reexport/in_root_and_mod.rs +++ /dev/null @@ -1,16 +0,0 @@ -#![feature(no_core)] -#![no_core] - -// @!has "$.index[*][?(@.name=='foo')]" -mod foo { - // @has "$.index[*][?(@.name=='Foo')]" - pub struct Foo; -} - -// @has "$.index[*][?(@.kind=='import' && @.inner.source=='foo::Foo')]" -pub use foo::Foo; - -pub mod bar { - // @has "$.index[*][?(@.kind=='import' && @.inner.source=='crate::foo::Foo')]" - pub use crate::foo::Foo; -} diff --git a/src/test/rustdoc-json/reexport/in_root_and_mod_pub.rs b/src/test/rustdoc-json/reexport/in_root_and_mod_pub.rs deleted file mode 100644 index f6d932d92..000000000 --- a/src/test/rustdoc-json/reexport/in_root_and_mod_pub.rs +++ /dev/null @@ -1,20 +0,0 @@ -#![feature(no_core)] -#![no_core] - -pub mod foo { - // @set bar_id = "$.index[*][?(@.name=='Bar')].id" - // @ismany "$.index[*][?(@.name=='foo')].inner.items[*]" $bar_id - pub struct Bar; -} - -// @set root_import_id = "$.index[*][?(@.inner.source=='foo::Bar')].id" -// @is "$.index[*][?(@.inner.source=='foo::Bar')].inner.id" $bar_id -// @has "$.index[*][?(@.name=='in_root_and_mod_pub')].inner.items[*]" $root_import_id -pub use foo::Bar; - -pub mod baz { - // @set baz_import_id = "$.index[*][?(@.inner.source=='crate::foo::Bar')].id" - // @is "$.index[*][?(@.inner.source=='crate::foo::Bar')].inner.id" $bar_id - // @ismany "$.index[*][?(@.name=='baz')].inner.items[*]" $baz_import_id - pub use crate::foo::Bar; -} diff --git a/src/test/rustdoc-json/reexport/macro.rs b/src/test/rustdoc-json/reexport/macro.rs deleted file mode 100644 index b4882100f..000000000 --- a/src/test/rustdoc-json/reexport/macro.rs +++ /dev/null @@ -1,15 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @set repro_id = "$.index[*][?(@.name=='repro')].id" -#[macro_export] -macro_rules! repro { - () => {}; -} - -// @set repro2_id = "$.index[*][?(@.inner.name=='repro2')].id" -pub use crate::repro as repro2; - -// @ismany "$.index[*][?(@.name=='macro')].inner.items[*]" $repro_id $repro2_id diff --git a/src/test/rustdoc-json/reexport/mod_not_included.rs b/src/test/rustdoc-json/reexport/mod_not_included.rs deleted file mode 100644 index 7b7600ef2..000000000 --- a/src/test/rustdoc-json/reexport/mod_not_included.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Regression test for https://github.com/rust-lang/rust/issues/101103 - -#![feature(no_core)] -#![no_core] - -mod m1 { - pub fn x() {} -} - -pub use m1::x; - -// @has "$.index[*][?(@.name=='x' && @.kind=='function')]" -// @has "$.index[*][?(@.kind=='import' && @.inner.name=='x')].inner.source" '"m1::x"' -// @!has "$.index[*][?(@.name=='m1')]" diff --git a/src/test/rustdoc-json/reexport/private_twice_one_inline.rs b/src/test/rustdoc-json/reexport/private_twice_one_inline.rs deleted file mode 100644 index 687a3b2ac..000000000 --- a/src/test/rustdoc-json/reexport/private_twice_one_inline.rs +++ /dev/null @@ -1,28 +0,0 @@ -// aux-build:pub-struct.rs -// ignore-tidy-linelength - -// Test for the ICE in https://github.com/rust-lang/rust/issues/83057 -// An external type re-exported with different attributes shouldn't cause an error - -#![no_core] -#![feature(no_core)] - -extern crate pub_struct as foo; -#[doc(inline)] - -// @set crate_use_id = "$.index[*][?(@.docs=='Hack A')].id" -// @set foo_id = "$.index[*][?(@.docs=='Hack A')].inner.id" -/// Hack A -pub use foo::Foo; - -// @set bar_id = "$.index[*][?(@.name=='bar')].id" -pub mod bar { - // @is "$.index[*][?(@.docs=='Hack B')].inner.id" $foo_id - // @set bar_use_id = "$.index[*][?(@.docs=='Hack B')].id" - // @ismany "$.index[*][?(@.name=='bar')].inner.items[*]" $bar_use_id - /// Hack B - pub use foo::Foo; -} - -// @ismany "$.index[*][?(@.kind=='import')].id" $crate_use_id $bar_use_id -// @ismany "$.index[*][?(@.name=='private_twice_one_inline')].inner.items[*]" $bar_id $crate_use_id diff --git a/src/test/rustdoc-json/reexport/private_two_names.rs b/src/test/rustdoc-json/reexport/private_two_names.rs deleted file mode 100644 index 9858538a9..000000000 --- a/src/test/rustdoc-json/reexport/private_two_names.rs +++ /dev/null @@ -1,22 +0,0 @@ -// ignore-tidy-linelength - -// Test for the ICE in https://github.com/rust-lang/rust/issues/83720 -// A pub-in-private type re-exported under two different names shouldn't cause an error - -#![no_core] -#![feature(no_core)] - -// @!has "$.index[*][?(@.name=='style')]" -mod style { - // @set color_struct_id = "$.index[*][?(@.kind=='struct' && @.name=='Color')].id" - pub struct Color; -} - -// @is "$.index[*][?(@.kind=='import' && @.inner.name=='Color')].inner.id" $color_struct_id -// @set color_export_id = "$.index[*][?(@.kind=='import' && @.inner.name=='Color')].id" -pub use style::Color; -// @is "$.index[*][?(@.kind=='import' && @.inner.name=='Colour')].inner.id" $color_struct_id -// @set colour_export_id = "$.index[*][?(@.kind=='import' && @.inner.name=='Colour')].id" -pub use style::Color as Colour; - -// @ismany "$.index[*][?(@.name=='private_two_names')].inner.items[*]" $color_export_id $colour_export_id diff --git a/src/test/rustdoc-json/reexport/reexport_method_from_private_module.rs b/src/test/rustdoc-json/reexport/reexport_method_from_private_module.rs deleted file mode 100644 index 239b1a23b..000000000 --- a/src/test/rustdoc-json/reexport/reexport_method_from_private_module.rs +++ /dev/null @@ -1,28 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/102583>. - -// @set impl_S = "$.index[*][?(@.docs=='impl S')].id" -// @has "$.index[*][?(@.name=='S')].inner.impls[*]" $impl_S -// @set is_present = "$.index[*][?(@.name=='is_present')].id" -// @is "$.index[*][?(@.docs=='impl S')].inner.items[*]" $is_present -// @!has "$.index[*][?(@.name=='hidden_impl')]" -// @!has "$.index[*][?(@.name=='hidden_fn')]" - -#![no_std] - -mod private_mod { - pub struct S; - - /// impl S - impl S { - pub fn is_present() {} - #[doc(hidden)] - pub fn hidden_fn() {} - } - - #[doc(hidden)] - impl S { - pub fn hidden_impl() {} - } -} - -pub use private_mod::*; diff --git a/src/test/rustdoc-json/reexport/rename_private.rs b/src/test/rustdoc-json/reexport/rename_private.rs deleted file mode 100644 index 8fd850f9b..000000000 --- a/src/test/rustdoc-json/reexport/rename_private.rs +++ /dev/null @@ -1,13 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @!has "$.index[*][?(@.kind=='inner')]" -mod inner { - // @has "$.index[*][?(@.name=='Public')]" - pub struct Public; -} - -// @is "$.index[*][?(@.kind=='import')].inner.name" \"NewName\" -pub use inner::Public as NewName; diff --git a/src/test/rustdoc-json/reexport/rename_public.rs b/src/test/rustdoc-json/reexport/rename_public.rs deleted file mode 100644 index e30907fe2..000000000 --- a/src/test/rustdoc-json/reexport/rename_public.rs +++ /dev/null @@ -1,17 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @set inner_id = "$.index[*][?(@.name=='inner')].id" -pub mod inner { - // @set public_id = "$.index[*][?(@.name=='Public')].id" - // @ismany "$.index[*][?(@.name=='inner')].inner.items[*]" $public_id - pub struct Public; -} -// @set import_id = "$.index[*][?(@.inner.name=='NewName')].id" -// @!has "$.index[*][?(@.inner.name=='Public')]" -// @is "$.index[*][?(@.inner.name=='NewName')].inner.source" \"inner::Public\" -pub use inner::Public as NewName; - -// @ismany "$.index[*][?(@.name=='rename_public')].inner.items[*]" $inner_id $import_id diff --git a/src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs b/src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs deleted file mode 100644 index 880dbdc44..000000000 --- a/src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs +++ /dev/null @@ -1,21 +0,0 @@ -// ignore-tidy-linelength - -// Regression test for <https://github.com/rust-lang/rust/issues/97432>. - -#![feature(no_core)] -#![no_std] -#![no_core] - -mod inner { - // @set trait_id = "$.index[*][?(@.name=='Trait')].id" - pub trait Trait {} -} - -// @set export_id = "$.index[*][?(@.inner.name=='Trait')].id" -// @is "$.index[*][?(@.inner.name=='Trait')].inner.id" $trait_id -pub use inner::Trait; -// @set reexport_id = "$.index[*][?(@.inner.name=='Reexport')].id" -// @is "$.index[*][?(@.inner.name=='Reexport')].inner.id" $trait_id -pub use inner::Trait as Reexport; - -// @ismany "$.index[*][?(@.name=='same_type_reexported_more_than_once')].inner.items[*]" $reexport_id $export_id diff --git a/src/test/rustdoc-json/reexport/simple_private.rs b/src/test/rustdoc-json/reexport/simple_private.rs deleted file mode 100644 index d058ce059..000000000 --- a/src/test/rustdoc-json/reexport/simple_private.rs +++ /dev/null @@ -1,16 +0,0 @@ -// edition:2018 -#![no_core] -#![feature(no_core)] - -// @!has "$.index[*][?(@.name=='inner')]" -mod inner { - // @set pub_id = "$.index[*][?(@.name=='Public')].id" - pub struct Public; -} - -// @is "$.index[*][?(@.kind=='import')].inner.name" \"Public\" -// @is "$.index[*][?(@.kind=='import')].inner.id" $pub_id -// @set use_id = "$.index[*][?(@.kind=='import')].id" -pub use inner::Public; - -// @ismany "$.index[*][?(@.name=='simple_private')].inner.items[*]" $use_id diff --git a/src/test/rustdoc-json/reexport/simple_public.rs b/src/test/rustdoc-json/reexport/simple_public.rs deleted file mode 100644 index e64a0dcb7..000000000 --- a/src/test/rustdoc-json/reexport/simple_public.rs +++ /dev/null @@ -1,18 +0,0 @@ -// edition:2018 - -#![no_core] -#![feature(no_core)] - -// @set inner_id = "$.index[*][?(@.name=='inner')].id" -pub mod inner { - - // @set public_id = "$.index[*][?(@.name=='Public')].id" - // @ismany "$.index[*][?(@.name=='inner')].inner.items[*]" $public_id - pub struct Public; -} - -// @set import_id = "$.index[*][?(@.inner.name=='Public')].id" -// @is "$.index[*][?(@.inner.name=='Public')].inner.source" \"inner::Public\" -pub use inner::Public; - -// @ismany "$.index[*][?(@.name=='simple_public')].inner.items[*]" $import_id $inner_id diff --git a/src/test/rustdoc-json/reexport/synthesize_trait_with_docs.rs b/src/test/rustdoc-json/reexport/synthesize_trait_with_docs.rs deleted file mode 100644 index 25a7c08d6..000000000 --- a/src/test/rustdoc-json/reexport/synthesize_trait_with_docs.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/105022> -// aux-build: trait_with_docs.rs - -extern crate trait_with_docs; - -pub struct Local; - -impl trait_with_docs::HasDocs for Local {} - -// @!has "$.index[*][?(@.name == 'HasDocs')]" diff --git a/src/test/rustdoc-json/return_private.rs b/src/test/rustdoc-json/return_private.rs deleted file mode 100644 index a8d1fae30..000000000 --- a/src/test/rustdoc-json/return_private.rs +++ /dev/null @@ -1,15 +0,0 @@ -// Regression test for <https://github.com/rust-lang/rust/issues/96161>. -// ignore-tidy-linelength - -#![feature(no_core)] -#![no_core] - -mod secret { - pub struct Secret; -} - -// @is "$.index[*][?(@.name=='get_secret')].kind" \"function\" -// @is "$.index[*][?(@.name=='get_secret')].inner.decl.output.inner.name" \"secret::Secret\" -pub fn get_secret() -> secret::Secret { - secret::Secret -} diff --git a/src/test/rustdoc-json/stripped_modules.rs b/src/test/rustdoc-json/stripped_modules.rs deleted file mode 100644 index d2664b49e..000000000 --- a/src/test/rustdoc-json/stripped_modules.rs +++ /dev/null @@ -1,21 +0,0 @@ -#![no_core] -#![feature(no_core)] - -// @!has "$.index[*][?(@.name=='no_pub_inner')]" -mod no_pub_inner { - fn priv_inner() {} -} - -// @!has "$.index[*][?(@.name=='pub_inner_unreachable')]" -mod pub_inner_unreachable { - // @!has "$.index[*][?(@.name=='pub_inner_1')]" - pub fn pub_inner_1() {} -} - -// @!has "$.index[*][?(@.name=='pub_inner_reachable')]" -mod pub_inner_reachable { - // @has "$.index[*][?(@.name=='pub_inner_2')]" - pub fn pub_inner_2() {} -} - -pub use pub_inner_reachable::pub_inner_2; 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, -} 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')]" diff --git a/src/test/rustdoc-json/type/dyn.rs b/src/test/rustdoc-json/type/dyn.rs deleted file mode 100644 index eaf249252..000000000 --- a/src/test/rustdoc-json/type/dyn.rs +++ /dev/null @@ -1,46 +0,0 @@ -// ignore-tidy-linelength -use std::fmt::Debug; - -// @count "$.index[*][?(@.name=='dyn')].inner.items[*]" 3 -// @set sync_int_gen = "$.index[*][?(@.name=='SyncIntGen')].id" -// @set ref_fn = "$.index[*][?(@.name=='RefFn')].id" -// @set weird_order = "$.index[*][?(@.name=='WeirdOrder')].id" -// @ismany "$.index[*][?(@.name=='dyn')].inner.items[*]" $sync_int_gen $ref_fn $weird_order - -// @is "$.index[*][?(@.name=='SyncIntGen')].kind" \"typedef\" -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.generics" '{"params": [], "where_predicates": []}' -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.kind" \"resolved_path\" -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.name" \"Box\" -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.bindings" [] -// @count "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args" 1 -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.kind" \"dyn_trait\" -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.lifetime" \"\'static\" -// @count "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[*]" 3 -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[0].generic_params" [] -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[1].generic_params" [] -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[2].generic_params" [] -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[0].trait.name" '"Fn"' -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[1].trait.name" '"Send"' -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[2].trait.name" '"Sync"' -// @is "$.index[*][?(@.name=='SyncIntGen')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[0].trait.args" '{"parenthesized": {"inputs": [],"output": {"inner": "i32","kind": "primitive"}}}' -pub type SyncIntGen = Box<dyn Fn() -> i32 + Send + Sync + 'static>; - -// @is "$.index[*][?(@.name=='RefFn')].kind" \"typedef\" -// @is "$.index[*][?(@.name=='RefFn')].inner.generics" '{"params": [{"kind": {"lifetime": {"outlives": []}},"name": "'\''a"}],"where_predicates": []}' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.mutable" 'false' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.lifetime" "\"'a\"" -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.kind" '"dyn_trait"' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.lifetime" null -// @count "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[*]" 1 -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].generic_params" '[{"kind": {"lifetime": {"outlives": []}},"name": "'\''b"}]' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].trait.name" '"Fn"' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].trait.args.parenthesized.inputs[0].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].trait.args.parenthesized.inputs[0].inner.lifetime" "\"'b\"" -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].trait.args.parenthesized.output.kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='RefFn')].inner.type.inner.type.inner.traits[0].trait.args.parenthesized.output.inner.lifetime" "\"'b\"" -pub type RefFn<'a> = &'a dyn for<'b> Fn(&'b i32) -> &'b i32; - -// @is "$.index[*][?(@.name=='WeirdOrder')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[0].trait.name" '"Send"' -// @is "$.index[*][?(@.name=='WeirdOrder')].inner.type.inner.args.angle_bracketed.args[0].type.inner.traits[1].trait.name" '"Debug"' -pub type WeirdOrder = Box<dyn Send + Debug>; diff --git a/src/test/rustdoc-json/type/extern.rs b/src/test/rustdoc-json/type/extern.rs deleted file mode 100644 index d287d5ebe..000000000 --- a/src/test/rustdoc-json/type/extern.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![feature(extern_types)] - -extern { - /// No inner information - pub type Foo; -} - -// @is "$.index[*][?(@.docs=='No inner information')].name" '"Foo"' -// @is "$.index[*][?(@.docs=='No inner information')].kind" '"foreign_type"' -// @!has "$.index[*][?(@.docs=='No inner information')].inner" diff --git a/src/test/rustdoc-json/type/fn_lifetime.rs b/src/test/rustdoc-json/type/fn_lifetime.rs deleted file mode 100644 index d7216ec76..000000000 --- a/src/test/rustdoc-json/type/fn_lifetime.rs +++ /dev/null @@ -1,27 +0,0 @@ -// ignore-tidy-linelength - -// @is "$.index[*][?(@.name=='GenericFn')].kind" \"typedef\" - -// @ismany "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].name" \"\'a\" -// @has "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].kind.lifetime" -// @count "$.index[*][?(@.name=='GenericFn')].inner.generics.params[*].kind.lifetime.outlives[*]" 0 -// @count "$.index[*][?(@.name=='GenericFn')].inner.generics.where_predicates[*]" 0 -// @is "$.index[*][?(@.name=='GenericFn')].inner.type.kind" \"function_pointer\" -// @count "$.index[*][?(@.name=='GenericFn')].inner.type.inner.generic_params[*]" 0 -// @count "$.index[*][?(@.name=='GenericFn')].inner.type.inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='GenericFn')].inner.type.inner.decl.inputs[*][1].inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='GenericFn')].inner.type.inner.decl.output.inner.lifetime" \"\'a\" - -pub type GenericFn<'a> = fn(&'a i32) -> &'a i32; - -// @is "$.index[*][?(@.name=='ForAll')].kind" \"typedef\" -// @count "$.index[*][?(@.name=='ForAll')].inner.generics.params[*]" 0 -// @count "$.index[*][?(@.name=='ForAll')].inner.generics.where_predicates[*]" 0 -// @count "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*]" 1 -// @is "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].name" \"\'a\" -// @has "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].kind.lifetime" -// @count "$.index[*][?(@.name=='ForAll')].inner.type.inner.generic_params[*].kind.lifetime.outlives[*]" 0 -// @count "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.inputs[*]" 1 -// @is "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.inputs[*][1].inner.lifetime" \"\'a\" -// @is "$.index[*][?(@.name=='ForAll')].inner.type.inner.decl.output.inner.lifetime" \"\'a\" -pub type ForAll = for<'a> fn(&'a i32) -> &'a i32; diff --git a/src/test/rustdoc-json/type/generic_default.rs b/src/test/rustdoc-json/type/generic_default.rs deleted file mode 100644 index 9c6d4540b..000000000 --- a/src/test/rustdoc-json/type/generic_default.rs +++ /dev/null @@ -1,33 +0,0 @@ -// ignore-tidy-linelength - -// @set result = "$.index[*][?(@.name=='Result')].id" -pub enum Result<T, E> { - Ok(T), - Err(E), -} - -// @set my_error = "$.index[*][?(@.name=='MyError')].id" -pub struct MyError {} - -// @is "$.index[*][?(@.name=='MyResult')].kind" \"typedef\" -// @count "$.index[*][?(@.name=='MyResult')].inner.generics.where_predicates[*]" 0 -// @count "$.index[*][?(@.name=='MyResult')].inner.generics.params[*]" 2 -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[0].name" \"T\" -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].name" \"E\" -// @has "$.index[*][?(@.name=='MyResult')].inner.generics.params[0].kind.type" -// @has "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].kind.type" -// @count "$.index[*][?(@.name=='MyResult')].inner.generics.params[0].kind.type.bounds[*]" 0 -// @count "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].kind.type.bounds[*]" 0 -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[0].kind.type.default" null -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].kind.type.default.kind" \"resolved_path\" -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].kind.type.default.inner.id" $my_error -// @is "$.index[*][?(@.name=='MyResult')].inner.generics.params[1].kind.type.default.inner.name" \"MyError\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.kind" \"resolved_path\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.id" $result -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.name" \"Result\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.args.angle_bracketed.bindings" [] -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.args.angle_bracketed.args[0].type.kind" \"generic\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.args.angle_bracketed.args[1].type.kind" \"generic\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.args.angle_bracketed.args[0].type.inner" \"T\" -// @is "$.index[*][?(@.name=='MyResult')].inner.type.inner.args.angle_bracketed.args[1].type.inner" \"E\" -pub type MyResult<T, E = MyError> = Result<T, E>; diff --git a/src/test/rustdoc-json/type/hrtb.rs b/src/test/rustdoc-json/type/hrtb.rs deleted file mode 100644 index 2c4ee00d4..000000000 --- a/src/test/rustdoc-json/type/hrtb.rs +++ /dev/null @@ -1,24 +0,0 @@ -// ignore-tidy-linelength - -// @is "$.index[*][?(@.name=='genfn')].inner.generics.where_predicates[0].bound_predicate.type" '{"inner": "F","kind": "generic"}' -// @is "$.index[*][?(@.name=='genfn')].inner.generics.where_predicates[0].bound_predicate.generic_params" '[{"kind": {"lifetime": {"outlives": []}},"name": "'\''a"},{"kind": {"lifetime": {"outlives": []}},"name": "'\''b"}]' -pub fn genfn<F>(f: F) -where - for<'a, 'b> F: Fn(&'a i32, &'b i32), -{ - let zero = 0; - f(&zero, &zero); -} - -// @is "$.index[*][?(@.name=='dynfn')].inner.generics" '{"params": [], "where_predicates": []}' -// @is "$.index[*][?(@.name=='dynfn')].inner.generics" '{"params": [], "where_predicates": []}' -// @is "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].kind" '"borrowed_ref"' -// @is "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].inner.type.kind" '"dyn_trait"' -// @is "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].inner.type.inner.lifetime" null -// @count "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].inner.type.inner.traits[*]" 1 -// @is "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].inner.type.inner.traits[0].generic_params" '[{"kind": {"lifetime": {"outlives": []}},"name": "'\''a"},{"kind": {"lifetime": {"outlives": []}},"name": "'\''b"}]' -// @is "$.index[*][?(@.name=='dynfn')].inner.decl.inputs[0][1].inner.type.inner.traits[0].trait.name" '"Fn"' -pub fn dynfn(f: &dyn for<'a, 'b> Fn(&'a i32, &'b i32)) { - let zero = 0; - f(&zero, &zero); -} diff --git a/src/test/rustdoc-json/unions/impl.rs b/src/test/rustdoc-json/unions/impl.rs deleted file mode 100644 index 4454a69ec..000000000 --- a/src/test/rustdoc-json/unions/impl.rs +++ /dev/null @@ -1,15 +0,0 @@ -#![no_std] - -// @is "$.index[*][?(@.name=='Ux')].visibility" \"public\" -// @is "$.index[*][?(@.name=='Ux')].kind" \"union\" -pub union Ux { - a: u32, - b: u64 -} - -// @is "$.index[*][?(@.name=='Num')].visibility" \"public\" -// @is "$.index[*][?(@.name=='Num')].kind" \"trait\" -pub trait Num {} - -// @count "$.index[*][?(@.name=='Ux')].inner.impls" 1 -impl Num for Ux {} diff --git a/src/test/rustdoc-json/unions/union.rs b/src/test/rustdoc-json/unions/union.rs deleted file mode 100644 index c9df2b81c..000000000 --- a/src/test/rustdoc-json/unions/union.rs +++ /dev/null @@ -1,15 +0,0 @@ -// @has "$.index[*][?(@.name=='Union')].visibility" \"public\" -// @has "$.index[*][?(@.name=='Union')].kind" \"union\" -// @!has "$.index[*][?(@.name=='Union')].inner.struct_type" -// @set Union = "$.index[*][?(@.name=='Union')].id" -pub union Union { - int: i32, - float: f32, -} - - -// @is "$.index[*][?(@.name=='make_int_union')].inner.decl.output.kind" '"resolved_path"' -// @is "$.index[*][?(@.name=='make_int_union')].inner.decl.output.inner.id" $Union -pub fn make_int_union(int: i32) -> Union { - Union { int } -} |