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/libstd/sys/mod.rs | |
| 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/libstd/sys/mod.rs')
| -rw-r--r-- | src/libstd/sys/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index 9eeab34643f..875ff1af920 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -69,7 +69,7 @@ cfg_if::cfg_if! { // On CloudABI and wasm right now the module below doesn't compile // (missing things in `libc` which is empty) so just omit everything // with an empty module - #[unstable(issue = "0", feature = "std_internals")] + #[unstable(issue = "none", feature = "std_internals")] #[allow(missing_docs)] pub mod unix_ext {} } else { @@ -92,7 +92,7 @@ cfg_if::cfg_if! { all(target_vendor = "fortanix", target_env = "sgx")))] { // On CloudABI and wasm right now the shim below doesn't compile, so // just omit it - #[unstable(issue = "0", feature = "std_internals")] + #[unstable(issue = "none", feature = "std_internals")] #[allow(missing_docs)] pub mod windows_ext {} } else { |