diff options
| author | bors <bors@rust-lang.org> | 2023-01-17 20:53:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-17 20:53:05 +0000 |
| commit | edefa4189f16f368c4de3b21615c07abcef0fe1a (patch) | |
| tree | 1c14817ccbc9d78cd1b1a93723b0f60b2f081aaa /compiler/rustc_parse/src | |
| parent | 3984bc5833db8bfb0acc522c9775383e4171f3de (diff) | |
| parent | 48bd3ab81dc87a4e5850c5c36ac01bb354dc3857 (diff) | |
| download | rust-edefa4189f16f368c4de3b21615c07abcef0fe1a.tar.gz rust-edefa4189f16f368c4de3b21615c07abcef0fe1a.zip | |
Auto merge of #106998 - matthiaskrgr:rollup-hmfisji, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #104505 (Remove double spaces after dots in comments) - #106784 (prevent E0512 from emitting [type error] by checking the references_error) - #106834 (new trait solver: only consider goal changed if response is not identity) - #106889 (Mention the lack of `windows_mut` in `windows`) - #106963 (Use `scope_expr_id` from `ProbeCtxt`) - #106970 (Switch to `EarlyBinder` for `item_bounds` query) - #106980 (Hide `_use_mk_alias_ty_instead` in `<AliasTy as Debug>::fmt`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs index 2fd2a4e5154..ffb23b50a16 100644 --- a/compiler/rustc_parse/src/parser/mod.rs +++ b/compiler/rustc_parse/src/parser/mod.rs @@ -542,9 +542,9 @@ impl<'a> Parser<'a> { } } - /// Expect next token to be edible or inedible token. If edible, + /// Expect next token to be edible or inedible token. If edible, /// then consume it; if inedible, then return without consuming - /// anything. Signal a fatal error if next token is unexpected. + /// anything. Signal a fatal error if next token is unexpected. pub fn expect_one_of( &mut self, edible: &[TokenKind], |