diff options
| author | bors <bors@rust-lang.org> | 2021-04-08 19:38:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-08 19:38:54 +0000 |
| commit | 2e495d2e845cf27740e3665f718acfd3aa17253e (patch) | |
| tree | e0d06408b8aaedcc30b3e475bbd21b298a4bcc0b /compiler/rustc_parse/src | |
| parent | 125505306744a0a5bb01d62337260a95d9ff8d57 (diff) | |
| parent | f77be846c622eb1a5d0bf0f3ab2dce547e10673a (diff) | |
| download | rust-2e495d2e845cf27740e3665f718acfd3aa17253e.tar.gz rust-2e495d2e845cf27740e3665f718acfd3aa17253e.zip | |
Auto merge of #84008 - Dylan-DPC:rollup-invxvg8, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #80733 (Improve links in inline code in `core::pin`.) - #81764 (Stabilize `rustdoc::bare_urls` lint) - #81938 (Stabilize `peekable_peek_mut`) - #83980 (Fix outdated crate names in compiler docs) - #83992 (Merge idents when generating source content) - #84001 (Update Clippy) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/lexer/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/lexer/mod.rs b/compiler/rustc_parse/src/lexer/mod.rs index 4bf870eb7ce..bd8dfd678a9 100644 --- a/compiler/rustc_parse/src/lexer/mod.rs +++ b/compiler/rustc_parse/src/lexer/mod.rs @@ -128,7 +128,7 @@ impl<'a> StringReader<'a> { } /// Turns simple `rustc_lexer::TokenKind` enum into a rich - /// `librustc_ast::TokenKind`. This turns strings into interned + /// `rustc_ast::TokenKind`. This turns strings into interned /// symbols and runs additional validation. fn cook_lexer_token(&self, token: rustc_lexer::TokenKind, start: BytePos) -> Option<TokenKind> { Some(match token { |