diff options
| author | bors <bors@rust-lang.org> | 2020-10-28 01:40:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-28 01:40:06 +0000 |
| commit | db241bb0c8d257e13c1560f6250e49879477039e (patch) | |
| tree | 492166fee5d39e53e20b60e1779a818691c43b31 /compiler/rustc_parse/src/parser/expr.rs | |
| parent | 90e6d0d46bae511aecea04ac5eeb3c387f0c04f4 (diff) | |
| parent | 6967005e6e626f4ff62f53b971c00e6e12d2e618 (diff) | |
| download | rust-db241bb0c8d257e13c1560f6250e49879477039e.tar.gz rust-db241bb0c8d257e13c1560f6250e49879477039e.zip | |
Auto merge of #78458 - Dylan-DPC:rollup-tan044s, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #78152 (Separate unsized locals) - #78297 (Suggest calling await on method call and field access) - #78351 (Move "mutable thing in const" check from interning to validity) - #78365 (check object safety of generic constants) - #78379 (Tweak invalid `fn` header and body parsing) - #78391 (Add const_fn in generics test) - #78401 (resolve: private fields in tuple struct ctor diag) - #78408 (Remove tokens from foreign items in `TokenStripper`) - #78447 (Fix typo in comment) - #78453 (Fix typo in comments) Failed merges: r? `@ghost`
Diffstat (limited to 'compiler/rustc_parse/src/parser/expr.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 5994eda966f..c2a13d4b0de 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -831,7 +831,7 @@ impl<'a> Parser<'a> { self.struct_span_err(self.token.span, &format!("unexpected token: `{}`", actual)).emit(); } - // We need and identifier or integer, but the next token is a float. + // We need an identifier or integer, but the next token is a float. // Break the float into components to extract the identifier or integer. // FIXME: With current `TokenCursor` it's hard to break tokens into more than 2 // parts unless those parts are processed immediately. `TokenCursor` should either |