forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#101639 - matthiaskrgr:rollup-sewkrgm, r=matth…
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#101413 (Use RelocModel::Pic for UEFI targets) - rust-lang#101595 (Fix ICE report flags display.) - rust-lang#101616 (Adapt test for msan message change) - rust-lang#101624 (rustdoc: remove unused CSS `#search { position: relative }`) - rust-lang#101633 (Rustdoc-Json: Correcty handle intra-doc-links to items without HTML page) - rust-lang#101634 (Rustdoc-Json Tests: Use ``@is`` and ``@ismany`` more often.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
21 changed files
with
138 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
// @has "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\" | ||
// @has "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\" | ||
// @is "$.index[*][?(@.name=='EnumTupleStruct')].visibility" \"public\" | ||
// @is "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\" | ||
pub enum EnumTupleStruct { | ||
// @has "$.index[*][?(@.name=='VariantA')].inner.variant_kind" \"tuple\" | ||
// @has "$.index[*][?(@.name=='0')].kind" \"struct_field\" | ||
// @has "$.index[*][?(@.name=='1')].kind" \"struct_field\" | ||
// @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), | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// 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(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
//! 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
#![feature(never_type)] | ||
|
||
// @has "$.index[*][?(@.name=='PrimNever')].visibility" \"public\" | ||
// @has "$.index[*][?(@.name=='PrimNever')].inner.type.kind" \"primitive\" | ||
// @has "$.index[*][?(@.name=='PrimNever')].inner.type.inner" \"never\" | ||
// @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 = !; | ||
|
||
// @has "$.index[*][?(@.name=='PrimStr')].inner.type.kind" \"primitive\" | ||
// @has "$.index[*][?(@.name=='PrimStr')].inner.type.inner" \"str\" | ||
// @is "$.index[*][?(@.name=='PrimStr')].inner.type.kind" \"primitive\" | ||
// @is "$.index[*][?(@.name=='PrimStr')].inner.type.inner" \"str\" | ||
pub type PrimStr = str; | ||
|
||
// @has "$.index[*][?(@.name=='PrimBool')].inner.type.kind" \"primitive\" | ||
// @has "$.index[*][?(@.name=='PrimBool')].inner.type.inner" \"bool\" | ||
// @is "$.index[*][?(@.name=='PrimBool')].inner.type.kind" \"primitive\" | ||
// @is "$.index[*][?(@.name=='PrimBool')].inner.type.inner" \"bool\" | ||
pub type PrimBool = bool; | ||
|
||
// @has "$.index[*][?(@.name=='PrimChar')].inner.type.kind" \"primitive\" | ||
// @has "$.index[*][?(@.name=='PrimChar')].inner.type.inner" \"char\" | ||
// @is "$.index[*][?(@.name=='PrimChar')].inner.type.kind" \"primitive\" | ||
// @is "$.index[*][?(@.name=='PrimChar')].inner.type.inner" \"char\" | ||
pub type PrimChar = char; | ||
|
||
// @has "$.index[*][?(@.name=='PrimU8')].inner.type.kind" \"primitive\" | ||
// @has "$.index[*][?(@.name=='PrimU8')].inner.type.inner" \"u8\" | ||
// @is "$.index[*][?(@.name=='PrimU8')].inner.type.kind" \"primitive\" | ||
// @is "$.index[*][?(@.name=='PrimU8')].inner.type.inner" \"u8\" | ||
pub type PrimU8 = u8; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,21 @@ | ||
// @has "$.index[*][?(@.name=='Foo')]" | ||
pub trait Foo { | ||
// @has "$.index[*][?(@.name=='no_self')].inner.has_body" false | ||
// @is "$.index[*][?(@.name=='no_self')].inner.has_body" false | ||
fn no_self(); | ||
// @has "$.index[*][?(@.name=='move_self')].inner.has_body" false | ||
// @is "$.index[*][?(@.name=='move_self')].inner.has_body" false | ||
fn move_self(self); | ||
// @has "$.index[*][?(@.name=='ref_self')].inner.has_body" false | ||
// @is "$.index[*][?(@.name=='ref_self')].inner.has_body" false | ||
fn ref_self(&self); | ||
|
||
// @has "$.index[*][?(@.name=='no_self_def')].inner.has_body" true | ||
// @is "$.index[*][?(@.name=='no_self_def')].inner.has_body" true | ||
fn no_self_def() {} | ||
// @has "$.index[*][?(@.name=='move_self_def')].inner.has_body" true | ||
// @is "$.index[*][?(@.name=='move_self_def')].inner.has_body" true | ||
fn move_self_def(self) {} | ||
// @has "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true | ||
// @is "$.index[*][?(@.name=='ref_self_def')].inner.has_body" true | ||
fn ref_self_def(&self) {} | ||
} | ||
|
||
pub trait Bar: Clone { | ||
// @has "$.index[*][?(@.name=='method')].inner.has_body" false | ||
// @is "$.index[*][?(@.name=='method')].inner.has_body" false | ||
fn method(&self, param: usize); | ||
} |
Oops, something went wrong.