diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-02 08:59:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-02 08:59:28 +0100 |
commit | c3bf7659b13a14541ddcff9c243c79b45bfd6829 (patch) | |
tree | c8b6d3e3add2e9eb1d672eb0881bedb40863a3ec | |
parent | 505ff4070a3de962dbde66f08b6550cda2eb4eab (diff) | |
parent | ff678e1349e9bad0a03337d7feadc0e90a192c56 (diff) |
Merge #6116
6116: Up rustc-ap-rustc_lexer to 681 r=matklad a=kjeremy
cargo update as well
Co-authored-by: kjeremy <[email protected]>
-rw-r--r-- | Cargo.lock | 28 | ||||
-rw-r--r-- | crates/syntax/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/syntax/src/parsing/lexer.rs | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5b69e3cab..49022502d 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -214,9 +214,9 @@ dependencies = [ | |||
214 | 214 | ||
215 | [[package]] | 215 | [[package]] |
216 | name = "chrono" | 216 | name = "chrono" |
217 | version = "0.4.18" | 217 | version = "0.4.19" |
218 | source = "registry+https://github.com/rust-lang/crates.io-index" | 218 | source = "registry+https://github.com/rust-lang/crates.io-index" |
219 | checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772" | 219 | checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" |
220 | dependencies = [ | 220 | dependencies = [ |
221 | "libc", | 221 | "libc", |
222 | "num-integer", | 222 | "num-integer", |
@@ -365,9 +365,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" | |||
365 | 365 | ||
366 | [[package]] | 366 | [[package]] |
367 | name = "flate2" | 367 | name = "flate2" |
368 | version = "1.0.17" | 368 | version = "1.0.18" |
369 | source = "registry+https://github.com/rust-lang/crates.io-index" | 369 | source = "registry+https://github.com/rust-lang/crates.io-index" |
370 | checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" | 370 | checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" |
371 | dependencies = [ | 371 | dependencies = [ |
372 | "cfg-if", | 372 | "cfg-if", |
373 | "crc32fast", | 373 | "crc32fast", |
@@ -725,9 +725,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" | |||
725 | 725 | ||
726 | [[package]] | 726 | [[package]] |
727 | name = "libc" | 727 | name = "libc" |
728 | version = "0.2.77" | 728 | version = "0.2.78" |
729 | source = "registry+https://github.com/rust-lang/crates.io-index" | 729 | source = "registry+https://github.com/rust-lang/crates.io-index" |
730 | checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" | 730 | checksum = "aa7087f49d294270db4e1928fc110c976cd4b9e5a16348e0a1df09afa99e6c98" |
731 | 731 | ||
732 | [[package]] | 732 | [[package]] |
733 | name = "libloading" | 733 | name = "libloading" |
@@ -1071,9 +1071,9 @@ checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" | |||
1071 | 1071 | ||
1072 | [[package]] | 1072 | [[package]] |
1073 | name = "pin-project-lite" | 1073 | name = "pin-project-lite" |
1074 | version = "0.1.9" | 1074 | version = "0.1.10" |
1075 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1075 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1076 | checksum = "4fe74897791e156a0cd8cce0db31b9b2198e67877316bf3086c3acd187f719f0" | 1076 | checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95" |
1077 | 1077 | ||
1078 | [[package]] | 1078 | [[package]] |
1079 | name = "plain" | 1079 | name = "plain" |
@@ -1083,9 +1083,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" | |||
1083 | 1083 | ||
1084 | [[package]] | 1084 | [[package]] |
1085 | name = "proc-macro2" | 1085 | name = "proc-macro2" |
1086 | version = "1.0.23" | 1086 | version = "1.0.24" |
1087 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1087 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1088 | checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9" | 1088 | checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" |
1089 | dependencies = [ | 1089 | dependencies = [ |
1090 | "unicode-xid", | 1090 | "unicode-xid", |
1091 | ] | 1091 | ] |
@@ -1300,9 +1300,9 @@ dependencies = [ | |||
1300 | 1300 | ||
1301 | [[package]] | 1301 | [[package]] |
1302 | name = "rustc-ap-rustc_lexer" | 1302 | name = "rustc-ap-rustc_lexer" |
1303 | version = "673.0.0" | 1303 | version = "681.0.0" |
1304 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1304 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1305 | checksum = "f6b71fa1285bdefe5fb61e59b63d6cc246abf337f4acafdd620d721bc488e671" | 1305 | checksum = "01e579a90506e9d9c9a098f380cad55b9ecf9e7be9fa96cb67b31f52045f41a8" |
1306 | dependencies = [ | 1306 | dependencies = [ |
1307 | "unicode-xid", | 1307 | "unicode-xid", |
1308 | ] | 1308 | ] |
@@ -1433,9 +1433,9 @@ dependencies = [ | |||
1433 | 1433 | ||
1434 | [[package]] | 1434 | [[package]] |
1435 | name = "serde_json" | 1435 | name = "serde_json" |
1436 | version = "1.0.57" | 1436 | version = "1.0.58" |
1437 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1437 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1438 | checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" | 1438 | checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4" |
1439 | dependencies = [ | 1439 | dependencies = [ |
1440 | "itoa", | 1440 | "itoa", |
1441 | "ryu", | 1441 | "ryu", |
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 | |||
13 | [dependencies] | 13 | [dependencies] |
14 | itertools = "0.9.0" | 14 | itertools = "0.9.0" |
15 | rowan = "0.10.0" | 15 | rowan = "0.10.0" |
16 | rustc_lexer = { version = "673.0.0", package = "rustc-ap-rustc_lexer" } | 16 | rustc_lexer = { version = "681.0.0", package = "rustc-ap-rustc_lexer" } |
17 | rustc-hash = "1.1.0" | 17 | rustc-hash = "1.1.0" |
18 | arrayvec = "0.5.1" | 18 | arrayvec = "0.5.1" |
19 | once_cell = "1.3.1" | 19 | 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( | |||
120 | 120 | ||
121 | let syntax_kind = { | 121 | let syntax_kind = { |
122 | match rustc_token_kind { | 122 | match rustc_token_kind { |
123 | rustc_lexer::TokenKind::LineComment => COMMENT, | 123 | rustc_lexer::TokenKind::LineComment { doc_style: _ } => COMMENT, |
124 | 124 | ||
125 | rustc_lexer::TokenKind::BlockComment { terminated: true } => COMMENT, | 125 | rustc_lexer::TokenKind::BlockComment { doc_style: _, terminated: true } => COMMENT, |
126 | rustc_lexer::TokenKind::BlockComment { terminated: false } => { | 126 | rustc_lexer::TokenKind::BlockComment { doc_style: _, terminated: false } => { |
127 | return ( | 127 | return ( |
128 | COMMENT, | 128 | COMMENT, |
129 | Some("Missing trailing `*/` symbols to terminate the block comment"), | 129 | Some("Missing trailing `*/` symbols to terminate the block comment"), |
@@ -164,7 +164,7 @@ fn rustc_token_kind_to_syntax_kind( | |||
164 | rustc_lexer::TokenKind::Colon => T![:], | 164 | rustc_lexer::TokenKind::Colon => T![:], |
165 | rustc_lexer::TokenKind::Dollar => T![$], | 165 | rustc_lexer::TokenKind::Dollar => T![$], |
166 | rustc_lexer::TokenKind::Eq => T![=], | 166 | rustc_lexer::TokenKind::Eq => T![=], |
167 | rustc_lexer::TokenKind::Not => T![!], | 167 | rustc_lexer::TokenKind::Bang => T![!], |
168 | rustc_lexer::TokenKind::Lt => T![<], | 168 | rustc_lexer::TokenKind::Lt => T![<], |
169 | rustc_lexer::TokenKind::Gt => T![>], | 169 | rustc_lexer::TokenKind::Gt => T![>], |
170 | rustc_lexer::TokenKind::Minus => T![-], | 170 | rustc_lexer::TokenKind::Minus => T![-], |