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/libsyntax | |
| 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/libsyntax')
| -rw-r--r-- | src/libsyntax/attr/builtin.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs index a37b27f67bc..d780d0ad764 100644 --- a/src/libsyntax/attr/builtin.rs +++ b/src/libsyntax/attr/builtin.rs @@ -376,11 +376,11 @@ fn find_stability_generic<'a, I>(sess: &ParseSess, match (feature, reason, issue) { (Some(feature), reason, Some(issue)) => { let issue = match &*issue.as_str() { - // FIXME(rossmacarthur): remove "0" because "none" should be used - // See #41260 - "none" | "0" => None, + "none" => None, issue => { if let Ok(num) = issue.parse() { + // FIXME(rossmacarthur): disallow 0 + // Disallowing this requires updates to some submodules NonZeroU32::new(num) } else { span_err!( |