diff options
| author | bors <bors@rust-lang.org> | 2020-11-21 20:18:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-21 20:18:11 +0000 |
| commit | da384694807172f0ca40eca2e49a11688aba6e93 (patch) | |
| tree | b1b379214fe7fc680444775c1514583c70d71bea /src/test/rustdoc | |
| parent | 3adedb8f4c5bb71e9e8a21a047cf8ed121ce0e75 (diff) | |
| parent | 68c9caa6f69d015f39a25e5acbcf90f9a72c7287 (diff) | |
| download | rust-da384694807172f0ca40eca2e49a11688aba6e93.tar.gz rust-da384694807172f0ca40eca2e49a11688aba6e93.zip | |
Auto merge of #79273 - Dylan-DPC:rollup-zd10xlt, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #77844 (clarify rules for ZST Boxes) - #79067 (Refactor the abi handling code a bit) - #79182 (Fix links to extern types in rustdoc (fixes #78777)) - #79231 (Exhaustively match in variant count instrinsic) - #79238 (Direct RUSTC_LOG (tracing/log) output to stderr instead of stdout.) - #79256 (Fix typos) - #79264 (Get rid of some doctree items) - #79272 (Support building clone shims for arrays with generic size) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/intra-link-extern-type.rs | 18 | ||||
| -rw-r--r-- | src/test/rustdoc/redirect-rename.rs | 12 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/test/rustdoc/intra-link-extern-type.rs b/src/test/rustdoc/intra-link-extern-type.rs new file mode 100644 index 00000000000..418e0d91ea7 --- /dev/null +++ b/src/test/rustdoc/intra-link-extern-type.rs @@ -0,0 +1,18 @@ +#![feature(extern_types)] + +extern { + pub type ExternType; +} + +impl ExternType { + pub fn f(&self) { + + } +} + +// @has 'intra_link_extern_type/foreigntype.ExternType.html' +// @has 'intra_link_extern_type/fn.links_to_extern_type.html' \ +// 'href="../intra_link_extern_type/foreigntype.ExternType.html#method.f"' +/// See also [ExternType::f] +pub fn links_to_extern_type() { +} diff --git a/src/test/rustdoc/redirect-rename.rs b/src/test/rustdoc/redirect-rename.rs index 7de56080e52..504c0687c8d 100644 --- a/src/test/rustdoc/redirect-rename.rs +++ b/src/test/rustdoc/redirect-rename.rs @@ -4,6 +4,10 @@ mod hidden { // @has foo/hidden/struct.Foo.html // @has - '//p/a' '../../foo/struct.FooBar.html' pub struct Foo {} + pub union U { a: usize } + pub enum Empty {} + pub const C: usize = 1; + pub static S: usize = 1; // @has foo/hidden/bar/index.html // @has - '//p/a' '../../foo/baz/index.html' @@ -16,6 +20,14 @@ mod hidden { // @has foo/struct.FooBar.html pub use hidden::Foo as FooBar; +// @has foo/union.FooU.html +pub use hidden::U as FooU; +// @has foo/enum.FooEmpty.html +pub use hidden::Empty as FooEmpty; +// @has foo/constant.FooC.html +pub use hidden::C as FooC; +// @has foo/static.FooS.html +pub use hidden::S as FooS; // @has foo/baz/index.html // @has foo/baz/struct.Thing.html |
