Skip to content

Commit a1d4718

Browse files
authored
Rollup merge of rust-lang#110329 - aDotInTheVoid:json-inline-again, r=jyn514
Improve tests for rust-lang#110138 These should live in rustdoc-json, not rustdoc-ui, so we can run assertions, and not just check there's no ICE CC rust-lang#100515, as we never document this suite r? rustdoc
2 parents ce30232 + e3de409 commit a1d4718

File tree

5 files changed

+26
-11
lines changed

5 files changed

+26
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
//! Should not be inlined
2+
3+
/// Should not be inlined
4+
pub enum O {
5+
L = -1,
6+
}
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Regression Test for https://github.com/rust-lang/rust/issues/110138
2+
// aux-build: enum_with_discriminant.rs
3+
4+
#[doc(inline)]
5+
pub extern crate enum_with_discriminant;
6+
7+
// @!has '$.index[*][?(@.docs == "Should not be inlined")]'
8+
// @is '$.index[*][?(@.name == "enum_with_discriminant")].kind' '"extern_crate"'
9+
// @set enum_with_discriminant = '$.index[*][?(@.name == "enum_with_discriminant")].id'
10+
// @is '$.index[*][?(@.name == "doc_inline_external_crate")].inner.items[*]' $enum_with_discriminant

Diff for: tests/rustdoc-json/reexport/extern_crate_glob.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// aux-build: enum_with_discriminant.rs
2+
3+
extern crate enum_with_discriminant;
4+
5+
#[doc(inline)]
6+
pub use enum_with_discriminant::*;
7+
8+
// @!has '$.index[*][?(@.docs == "Should not be inlined")]'
9+
// @set use = '$.index[*][?(@.inner.name == "enum_with_discriminant")].id'
10+
// @is '$.index[*][?(@.name == "extern_crate_glob")].inner.items[*]' $use

Diff for: tests/rustdoc-ui/intra-doc/auxiliary/inner-crate-enum.rs

-3
This file was deleted.

Diff for: tests/rustdoc-ui/intra-doc/inline-external-enum.rs

-8
This file was deleted.

0 commit comments

Comments
 (0)