diff options
| author | bors <bors@rust-lang.org> | 2022-10-14 10:54:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-14 10:54:32 +0000 |
| commit | 9b0a099dfc9a97ecd10adb319396c731c4b2d169 (patch) | |
| tree | b95ae3a4db742d337565230878b5ca00b86008e5 /compiler/rustc_parse/src/parser | |
| parent | 32717603f61a566ff0b8293ef3177cb7c4f50fa9 (diff) | |
| parent | 7cf09c57a21110a4ef76ee4fe1cba960806fd42d (diff) | |
| download | rust-9b0a099dfc9a97ecd10adb319396c731c4b2d169.tar.gz rust-9b0a099dfc9a97ecd10adb319396c731c4b2d169.zip | |
Auto merge of #103048 - Dylan-DPC:rollup-47r62js, r=Dylan-DPC
Rollup of 8 pull requests
Successful merges:
- #102847 (impl AsFd and AsRawFd for io::{Stdin, Stdout, Stderr}, not the sys versions)
- #102856 (Only test duplicate inherent impl items in a single place)
- #102914 (Migrate css highlight without change)
- #102938 (Move some tests to more reasonable directories)
- #103015 (fix a typo)
- #103018 (More dupe word typos)
- #103025 (rustdoc: remove unused CSS `.search-container > *`)
- #103031 (Suppress irrefutable let patterns lint for prefixes in match guards)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index f57bd9cec19..828b7d2f2f7 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -2232,7 +2232,7 @@ impl<'a> Parser<'a> { /// /// When encountering code like `foo::< bar + 3 >` or `foo::< bar - baz >` we suggest /// `foo::<{ bar + 3 }>` and `foo::<{ bar - baz }>`, respectively. We only provide a suggestion - /// if we think that that the resulting expression would be well formed. + /// if we think that the resulting expression would be well formed. pub fn recover_const_arg( &mut self, start: Span, |