Skip to content

Commit b95b138

Browse files
GuillaumeGomezGuillaumeGomez
committed
Add tests for JSON non-inlining
1 parent 3c55a26 commit b95b138

12 files changed

+126
-24
lines changed

‎src/test/rustdoc-json/doc_hidden_failure.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Regression test for <https://github.com/rust-lang/rust/issues/98007>.
2+
3+
#![feature(no_core)]
4+
#![no_core]
5+
6+
mod auto {
7+
mod action_row {
8+
pub struct ActionRowBuilder;
9+
}
10+
11+
#[doc(hidden)]
12+
pub mod builders {
13+
pub use super::action_row::ActionRowBuilder;
14+
}
15+
}
16+
17+
// @count doc_hidden_failure.json "$.index[*][?(@.name=='builders')]" 2
18+
pub use auto::*;
19+
20+
pub mod builders {
21+
pub use crate::auto::builders::*;
22+
}

‎src/test/rustdoc-json/reexport/auxiliary/pub-struct.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub struct Foo;

‎src/test/rustdoc-json/reexport/glob_extern.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
#![no_core]
44
#![feature(no_core)]
55

6-
// @!has glob_extern.json "$.index[*][?(@.name=='mod1')]"
6+
// @is glob_extern.json "$.index[*][?(@.name=='mod1')].kind" \"module\"
7+
// @is glob_extern.json "$.index[*][?(@.name=='mod1')].inner.is_stripped" "true"
78
mod mod1 {
89
extern "C" {
9-
// @set public_fn_id = - "$.index[*][?(@.name=='public_fn')].id"
10+
// @has - "$.index[*][?(@.name=='public_fn')].id"
1011
pub fn public_fn();
1112
// @!has - "$.index[*][?(@.name=='private_fn')]"
1213
fn private_fn();
1314
}
1415
}
1516

16-
// @has - "$.index[*][?(@.name=='glob_extern')].inner.items[*]" $public_fn_id
17+
// @is - "$.index[*][?(@.kind=='import')].inner.glob" true
1718
pub use mod1::*;

‎src/test/rustdoc-json/reexport/glob_private.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,30 @@
33
#![no_core]
44
#![feature(no_core)]
55

6-
// @!has glob_private.json "$.index[*][?(@.name=='mod1')]"
6+
// @is glob_private.json "$.index[*][?(@.name=='mod1')].kind" \"module\"
7+
// @is glob_private.json "$.index[*][?(@.name=='mod1')].inner.is_stripped" "true"
78
mod mod1 {
8-
// @!has - "$.index[*][?(@.name=='mod2')]"
9+
// @is - "$.index[*][?(@.name=='mod2')].kind" \"module\"
10+
// @is - "$.index[*][?(@.name=='mod2')].inner.is_stripped" "true"
911
mod mod2 {
1012
// @set m2pub_id = - "$.index[*][?(@.name=='Mod2Public')].id"
1113
pub struct Mod2Public;
1214

1315
// @!has - "$.index[*][?(@.name=='Mod2Private')]"
1416
struct Mod2Private;
1517
}
18+
19+
// @has - "$.index[*][?(@.kind=='import' && @.inner.name=='mod2')]"
1620
pub use self::mod2::*;
1721

1822
// @set m1pub_id = - "$.index[*][?(@.name=='Mod1Public')].id"
1923
pub struct Mod1Public;
20-
2124
// @!has - "$.index[*][?(@.name=='Mod1Private')]"
2225
struct Mod1Private;
2326
}
27+
28+
// @has - "$.index[*][?(@.kind=='import' && @.inner.name=='mod1')]"
2429
pub use mod1::*;
2530

26-
// @has - "$.index[*][?(@.name=='glob_private')].inner.items[*]" $m2pub_id
27-
// @has - "$.index[*][?(@.name=='glob_private')].inner.items[*]" $m1pub_id
31+
// @has - "$.index[*][?(@.name=='mod2')].inner.items[*]" $m2pub_id
32+
// @has - "$.index[*][?(@.name=='mod1')].inner.items[*]" $m1pub_id

‎src/test/rustdoc-json/reexport/in_root_and_mod.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
#![feature(no_core)]
22
#![no_core]
33

4+
// @is in_root_and_mod.json "$.index[*][?(@.name=='foo')].kind" \"module\"
5+
// @is in_root_and_mod.json "$.index[*][?(@.name=='foo')].inner.is_stripped" "true"
46
mod foo {
5-
// @set foo_id = in_root_and_mod.json "$.index[*][?(@.name=='Foo')].id"
7+
// @has - "$.index[*][?(@.name=='Foo')]"
68
pub struct Foo;
79
}
810

9-
// @has - "$.index[*][?(@.name=='in_root_and_mod')].inner.items[*]" $foo_id
11+
// @has - "$.index[*][?(@.kind=='import' && @.inner.source=='foo::Foo')]"
1012
pub use foo::Foo;
1113

1214
pub mod bar {
13-
// @has - "$.index[*][?(@.name=='bar')].inner.items[*]" $foo_id
15+
// @has - "$.index[*][?(@.kind=='import' && @.inner.source=='crate::foo::Foo')]"
1416
pub use crate::foo::Foo;
1517
}

‎src/test/rustdoc-json/reexport/private_twice_one_inline.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// aux-build:pub-struct.rs
2+
3+
// Test for the ICE in rust/83057
4+
// Am external type re-exported with different attributes shouldn't cause an error
5+
6+
#![no_core]
7+
#![feature(no_core)]
8+
9+
extern crate pub_struct as foo;
10+
11+
#[doc(inline)]
12+
pub use foo::Foo;
13+
14+
pub mod bar {
15+
pub use foo::Foo;
16+
}
17+
18+
// @count private_twice_one_inline.json "$.index[*][?(@.kind=='import')]" 2

‎src/test/rustdoc-json/reexport/private_two_names.rs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Test for the ICE in rust/83720
2+
// A pub-in-private type re-exported under two different names shouldn't cause an error
3+
4+
#![no_core]
5+
#![feature(no_core)]
6+
7+
// @is private_two_names.json "$.index[*][?(@.name=='style')].kind" \"module\"
8+
// @is private_two_names.json "$.index[*][?(@.name=='style')].inner.is_stripped" "true"
9+
mod style {
10+
// @has - "$.index[*](?(@.name=='Color'))"
11+
pub struct Color;
12+
}
13+
14+
// @has - "$.index[*][?(@.kind=='import' && @.inner.name=='Color')]"
15+
pub use style::Color;
16+
// @has - "$.index[*][?(@.kind=='import' && @.inner.name=='Colour')]"
17+
pub use style::Color as Colour;

‎src/test/rustdoc-json/reexport/rename_private.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
#![no_core]
44
#![feature(no_core)]
5-
// @!has rename_private.json "$.index[*][?(@.name=='inner')]"
5+
6+
// @is rename_private.json "$.index[*][?(@.name=='inner')].kind" \"module\"
7+
// @is rename_private.json "$.index[*][?(@.name=='inner')].inner.is_stripped" "true"
68
mod inner {
7-
// @!has - "$.index[*][?(@.name=='Public')]"
9+
// @has - "$.index[*][?(@.name=='Public')]"
810
pub struct Public;
911
}
1012

11-
// @set newname_id = - "$.index[*][?(@.name=='NewName')].id"
12-
// @is - "$.index[*][?(@.name=='NewName')].kind" \"struct\"
13-
// @has - "$.index[*][?(@.name=='rename_private')].inner.items[*]" $newname_id
13+
// @is - "$.index[*][?(@.kind=='import')].inner.name" \"NewName\"
1414
pub use inner::Public as NewName;

‎src/test/rustdoc-json/reexport/same_type_reexported_more_than_once.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
// Regression test for https://github.com/rust-lang/rust/issues/97432.
1+
// Regression test for <https://github.com/rust-lang/rust/issues/97432>.
22

33
#![feature(no_core)]
44
#![no_std]
55
#![no_core]
66

77
// @has same_type_reexported_more_than_once.json
8-
// @set trait_id = - "$.index[*][?(@.name=='Trait')].id"
9-
// @has - "$.index[*][?(@.name=='same_type_reexported_more_than_once')].inner.items[*]" $trait_id
8+
// @has - "$.index[*][?(@.name=='Trait')]"
109
pub use inner::Trait;
11-
// @set reexport_id = - "$.index[*][?(@.name=='Reexport')].id"
12-
// @has - "$.index[*][?(@.name=='same_type_reexported_more_than_once')].inner.items[*]" $reexport_id
10+
// @has - "$.index[*].inner[?(@.name=='Reexport')].id"
1311
pub use inner::Trait as Reexport;
1412

1513
mod inner {

‎src/test/rustdoc-json/reexport/simple_private.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
// edition:2018
2-
32
#![no_core]
43
#![feature(no_core)]
54

6-
// @!has simple_private.json "$.index[*][?(@.name=='inner')]"
5+
// @is simple_private.json "$.index[*][?(@.name=='inner')].kind" \"module\"
6+
// @is simple_private.json "$.index[*][?(@.name=='inner')].inner.is_stripped" "true"
77
mod inner {
88
// @set pub_id = - "$.index[*][?(@.name=='Public')].id"
99
pub struct Public;
1010
}
1111

12-
// @has - "$.index[*][?(@.name=='simple_private')].inner.items[*]" $pub_id
12+
// @is - "$.index[*][?(@.kind=='import')].inner.name" \"Public\"
1313
pub use inner::Public;
14+
15+
// @has - "$.index[*][?(@.name=='inner')].inner.items[*]" $pub_id

0 commit comments

Comments
 (0)