-
Notifications
You must be signed in to change notification settings - Fork 13.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #110329 - aDotInTheVoid:json-inline-again, r=jyn514
Improve tests for #110138 These should live in rustdoc-json, not rustdoc-ui, so we can run assertions, and not just check there's no ICE CC #100515, as we never document this suite r? rustdoc
- Loading branch information
Showing
5 changed files
with
26 additions
and
11 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
tests/rustdoc-json/reexport/auxiliary/enum_with_discriminant.rs
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,6 @@ | ||
//! Should not be inlined | ||
/// Should not be inlined | ||
pub enum O { | ||
L = -1, | ||
} |
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,10 @@ | ||
// Regression Test for https://github.com/rust-lang/rust/issues/110138 | ||
// aux-build: enum_with_discriminant.rs | ||
|
||
#[doc(inline)] | ||
pub extern crate enum_with_discriminant; | ||
|
||
// @!has '$.index[*][?(@.docs == "Should not be inlined")]' | ||
// @is '$.index[*][?(@.name == "enum_with_discriminant")].kind' '"extern_crate"' | ||
// @set enum_with_discriminant = '$.index[*][?(@.name == "enum_with_discriminant")].id' | ||
// @is '$.index[*][?(@.name == "doc_inline_external_crate")].inner.items[*]' $enum_with_discriminant |
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,10 @@ | ||
// aux-build: enum_with_discriminant.rs | ||
|
||
extern crate enum_with_discriminant; | ||
|
||
#[doc(inline)] | ||
pub use enum_with_discriminant::*; | ||
|
||
// @!has '$.index[*][?(@.docs == "Should not be inlined")]' | ||
// @set use = '$.index[*][?(@.inner.name == "enum_with_discriminant")].id' | ||
// @is '$.index[*][?(@.name == "extern_crate_glob")].inner.items[*]' $use |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.