diff options
| author | bors <bors@rust-lang.org> | 2019-12-22 07:01:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-22 07:01:50 +0000 |
| commit | 3982d3514efbb65b3efac6bb006b3fa496d16663 (patch) | |
| tree | 5fcfb7b8bd5ee606865be1abb448a4858f8c6770 /src/test/rustdoc | |
| parent | 005cf38f7e66757b32b03ea35fedca372eb063e3 (diff) | |
| parent | ca528fcc046aca3e1cccb74a4bbebe855df3e3b6 (diff) | |
| download | rust-3982d3514efbb65b3efac6bb006b3fa496d16663.tar.gz rust-3982d3514efbb65b3efac6bb006b3fa496d16663.zip | |
Auto merge of #67505 - Centril:rollup-7win7ty, r=Centril
Rollup of 6 pull requests Successful merges: - #67148 ( Refactor type & bounds parsing thoroughly) - #67410 (Reenable static linking of libstdc++ on windows-gnu) - #67439 (Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck) - #67480 (Require issue = "none" over issue = "0" in unstable attributes) - #67500 (Tweak non_shorthand_field_patterns' suggestion) - #67504 (Warn against relying on ?Sized being last) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/const-display.rs | 8 | ||||
| -rw-r--r-- | src/test/rustdoc/inline_cross/auxiliary/macros.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/stability.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/test/rustdoc/const-display.rs b/src/test/rustdoc/const-display.rs index bc7ad04b6a2..8e0d230f7d0 100644 --- a/src/test/rustdoc/const-display.rs +++ b/src/test/rustdoc/const-display.rs @@ -2,18 +2,18 @@ #![unstable(feature = "humans", reason = "who ever let humans program computers, we're apparently really bad at it", - issue = "0")] + issue = "none")] #![feature(foo, foo2)] #![feature(staged_api)] // @has 'foo/fn.foo.html' '//pre' 'pub unsafe fn foo() -> u32' #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_const_unstable(feature="foo", issue = "0")] +#[rustc_const_unstable(feature="foo", issue = "none")] pub const unsafe fn foo() -> u32 { 42 } // @has 'foo/fn.foo2.html' '//pre' 'pub fn foo2() -> u32' -#[unstable(feature = "humans", issue="0")] +#[unstable(feature = "humans", issue = "none")] pub const fn foo2() -> u32 { 42 } // @has 'foo/fn.bar2.html' '//pre' 'pub const fn bar2() -> u32' @@ -22,7 +22,7 @@ pub const fn foo2() -> u32 { 42 } pub const fn bar2() -> u32 { 42 } // @has 'foo/fn.foo2_gated.html' '//pre' 'pub unsafe fn foo2_gated() -> u32' -#[unstable(feature = "foo2", issue="0")] +#[unstable(feature = "foo2", issue = "none")] pub const unsafe fn foo2_gated() -> u32 { 42 } // @has 'foo/fn.bar2_gated.html' '//pre' 'pub const unsafe fn bar2_gated() -> u32' diff --git a/src/test/rustdoc/inline_cross/auxiliary/macros.rs b/src/test/rustdoc/inline_cross/auxiliary/macros.rs index 6189b018037..2165be97452 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/macros.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/macros.rs @@ -3,7 +3,7 @@ #![stable(feature = "rust1", since = "1.0.0")] /// docs for my_macro -#[unstable(feature = "macro_test", issue = "0")] +#[unstable(feature = "macro_test", issue = "none")] #[rustc_deprecated(since = "1.2.3", reason = "text")] #[macro_export] macro_rules! my_macro { diff --git a/src/test/rustdoc/stability.rs b/src/test/rustdoc/stability.rs index 18a21603493..b1b97fe134e 100644 --- a/src/test/rustdoc/stability.rs +++ b/src/test/rustdoc/stability.rs @@ -1,6 +1,6 @@ #![feature(staged_api)] -#![unstable(feature = "test", issue = "0")] +#![unstable(feature = "test", issue = "none")] pub struct Unstable { // @has stability/struct.Unstable.html \ |