diff options
| author | bors <bors@rust-lang.org> | 2018-04-24 05:43:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-24 05:43:32 +0000 |
| commit | 52ed3d8761dc42e51429eb3bbf56a94d14fdd5c6 (patch) | |
| tree | fe2dca988e2194b65e4103ff6012bdce4ab3433e /src/libsyntax | |
| parent | f305b025cf907d0bbdd2135ec59d89cd32e5cbe9 (diff) | |
| parent | 893774e119b3197e12c1891b39d0e1e2830a362d (diff) | |
| download | rust-52ed3d8761dc42e51429eb3bbf56a94d14fdd5c6.tar.gz rust-52ed3d8761dc42e51429eb3bbf56a94d14fdd5c6.zip | |
Auto merge of #50191 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests Successful merges: - #49461 (std: Child::kill() returns error if process has already exited) - #49727 (Add Cell::update) - #49812 (Fix revision support for UI tests.) - #49829 (Add doc links to `std::os` extension traits) - #49906 (Stabilize `std::hint::unreachable_unchecked`.) - #49970 (Deprecate Read::chars and char::decode_utf8) - #49985 (don't see issue #0) - #50118 (fix search bar bug) - #50139 (encourage descriptive issue titles) - #50174 (Use FxHashMap in syntax_pos::symbol::Interner::intern.) - #50185 (core: Fix overflow in `int::mod_euc` when `self < 0 && rhs == MIN`) Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index d20e94b018b..120dff2dbb9 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -1242,10 +1242,9 @@ fn leveled_feature_err<'a>(sess: &'a ParseSess, feature: &str, span: Span, issue GateIssue::Library(lib) => lib, }; - let explanation = if let Some(n) = issue { - format!("{} (see issue #{})", explain, n) - } else { - explain.to_owned() + let explanation = match issue { + None | Some(0) => explain.to_owned(), + Some(n) => format!("{} (see issue #{})", explain, n) }; let mut err = match level { |