From ff678e1349e9bad0a03337d7feadc0e90a192c56 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Thu, 1 Oct 2020 15:20:18 -0400 Subject: Up rustc-ap-rustc_lexer to 681 cargo update as well --- crates/syntax/Cargo.toml | 2 +- crates/syntax/src/parsing/lexer.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/syntax') diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index af61bb658..0b15f10e9 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] itertools = "0.9.0" rowan = "0.10.0" -rustc_lexer = { version = "673.0.0", package = "rustc-ap-rustc_lexer" } +rustc_lexer = { version = "681.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.5.1" once_cell = "1.3.1" diff --git a/crates/syntax/src/parsing/lexer.rs b/crates/syntax/src/parsing/lexer.rs index fa3be1016..f1202113b 100644 --- a/crates/syntax/src/parsing/lexer.rs +++ b/crates/syntax/src/parsing/lexer.rs @@ -120,10 +120,10 @@ fn rustc_token_kind_to_syntax_kind( let syntax_kind = { match rustc_token_kind { - rustc_lexer::TokenKind::LineComment => COMMENT, + rustc_lexer::TokenKind::LineComment { doc_style: _ } => COMMENT, - rustc_lexer::TokenKind::BlockComment { terminated: true } => COMMENT, - rustc_lexer::TokenKind::BlockComment { terminated: false } => { + rustc_lexer::TokenKind::BlockComment { doc_style: _, terminated: true } => COMMENT, + rustc_lexer::TokenKind::BlockComment { doc_style: _, terminated: false } => { return ( COMMENT, Some("Missing trailing `*/` symbols to terminate the block comment"), @@ -164,7 +164,7 @@ fn rustc_token_kind_to_syntax_kind( rustc_lexer::TokenKind::Colon => T![:], rustc_lexer::TokenKind::Dollar => T![$], rustc_lexer::TokenKind::Eq => T![=], - rustc_lexer::TokenKind::Not => T![!], + rustc_lexer::TokenKind::Bang => T![!], rustc_lexer::TokenKind::Lt => T![<], rustc_lexer::TokenKind::Gt => T![>], rustc_lexer::TokenKind::Minus => T![-], -- cgit v1.2.3