diff options
| author | bors <bors@rust-lang.org> | 2019-08-29 05:05:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-29 05:05:17 +0000 |
| commit | 85ed538d6988c6c82aea8750b306cb793e874294 (patch) | |
| tree | 6871fa85b73a88ec2d6d82b691b3309dd61f96f9 /src/libsyntax/parse/parser/path.rs | |
| parent | 347654324dde17135072d2d704a71209dd3c5ca3 (diff) | |
| parent | 73910092365b67fa897bc828b7a4ffa1f2c776cf (diff) | |
| download | rust-85ed538d6988c6c82aea8750b306cb793e874294.tar.gz rust-85ed538d6988c6c82aea8750b306cb793e874294.zip | |
Auto merge of #63990 - Centril:rollup-q1nt0b0, r=Centril
Rollup of 11 pull requests Successful merges: - #63811 (Correctly suggest adding bounds to `impl Trait` argument) - #63933 (Resolve some small issues related to #63580) - #63938 (or-pattern: fix typo in error message) - #63945 (Recover `mut $pat` and other improvements) - #63958 (const_prop: only call error_to_const_error if we are actually showing something) - #63961 (Add Option<Span> to `require_lang_item`) - #63963 (remove the reference to __cxa_thread_atexit_impl) - #63965 (Prevent syntax error in LD linker version script) - #63968 (rustc_apfloat: make the crate #![no_std] explicitly.) - #63970 (Notify me (flip1995) when Clippy toolstate changes) - #63980 (add missing `#[repr(C)]` on the Slices union) Failed merges: - #63989 (Add Yaah to clippy toolstain notification list) r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/path.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/path.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser/path.rs b/src/libsyntax/parse/parser/path.rs index 3eb4d45045a..d4b13cc2e01 100644 --- a/src/libsyntax/parse/parser/path.rs +++ b/src/libsyntax/parse/parser/path.rs @@ -423,7 +423,7 @@ impl<'a> Parser<'a> { // FIXME(const_generics): to distinguish between idents for types and consts, // we should introduce a GenericArg::Ident in the AST and distinguish when // lowering to the HIR. For now, idents for const args are not permitted. - if self.token.is_keyword(kw::True) || self.token.is_keyword(kw::False) { + if self.token.is_bool_lit() { self.parse_literal_maybe_minus()? } else { return Err( |