Merge #1583

1583: :arrow_up: rowan r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2019-07-24 09:44:40 +0100
committer: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2019-07-24 09:44:40 +0100
commit: a971c6d32d7d9736ac093fa62b5116e3e4a75989 (patch)
tree: 7cc19b9232131ba67310c34583790470651baa05
parent: 25921f5a5f54a160a20effc59e7abeb8d6bb7755 (diff)
parent: c79eea9fc1d7c3400031674b7ebb2b0671aa05e8 (diff)
2 files changed, 20 insertions, 20 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7c7836a13..76ec26428 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ name = "backtrace-sys"
 version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -150,7 +150,7 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -353,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -443,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -687,7 +687,7 @@ name = "jemalloc-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -886,7 +886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1006,7 +1006,7 @@ dependencies = [
 "proc-macro-hack 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1040,7 +1040,7 @@ dependencies = [
 "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1074,7 +1074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1324,7 +1324,7 @@ dependencies = [
 "ra_parser 0.1.0",
 "ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_text_edit 0.1.0",
- "rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1595,7 +1595,7 @@ dependencies = [
 [[package]]
 name = "rowan"
-version = "0.6.0-pre.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1653,7 +1653,7 @@ dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1703,7 +1703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1774,7 +1774,7 @@ name = "stacker"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1792,7 +1792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "0.15.40"
+version = "0.15.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1807,7 +1807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2147,7 +2147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
 "checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"
-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
+"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
 "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
@@ -2285,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "17f52a24414403f81528b67488cf8edc4eda977d3af1646bb6b106a600ead78f"
-"checksum rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0eeee40f1a2724b7d0d9fa5f73a7804cd2f4c91b37ba9f785d429f31819d60df"
+"checksum rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a796c0517d6969224c42e9ef01356363b0a7c57d10ec986c9a600d075666a5ff"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -2310,7 +2310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
-"checksum syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)" = "bc945221ccf4a7e8c31222b9d1fc77aefdd6638eb901a6ce457a3dc29d4c31e8"
+"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 9ef8dee5d..19e690f9e 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-analyzer/rust-analyzer"
 [dependencies]
 unicode-xid = "0.1.0"
 itertools = "0.8.0"
-rowan = "0.6.0-pre.1"
+rowan = "0.6.0"
 ra_rustc_lexer = { version = "0.1.0-pre.1", features = [ "unicode-xid" ] }
 # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
author	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2019-07-24 09:44:40 +0100
committer	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2019-07-24 09:44:40 +0100
commit	a971c6d32d7d9736ac093fa62b5116e3e4a75989 (patch)
tree	7cc19b9232131ba67310c34583790470651baa05
parent	25921f5a5f54a160a20effc59e7abeb8d6bb7755 (diff)
parent	c79eea9fc1d7c3400031674b7ebb2b0671aa05e8 (diff)

diff --git a/Cargo.lock b/Cargo.lock index 7c7836a13..76ec26428 100644 --- a/Cargo.lock +++ b/Cargo.lock
@@ -68,7 +68,7 @@ name = "backtrace-sys"
68	version = "0.1.31"	68	version = "0.1.31"
69	source = "registry+https://github.com/rust-lang/crates.io-index"	69	source = "registry+https://github.com/rust-lang/crates.io-index"
70	dependencies = [	70	dependencies = [
71	"cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",	71	"cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
72	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",	72	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
73	]	73	]
74		74
@@ -150,7 +150,7 @@ dependencies = [
150		150
151	[[package]]	151	[[package]]
152	name = "cc"	152	name = "cc"
153	version = "1.0.37"	153	version = "1.0.38"
154	source = "registry+https://github.com/rust-lang/crates.io-index"	154	source = "registry+https://github.com/rust-lang/crates.io-index"
155		155
156	[[package]]	156	[[package]]
@@ -353,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
353	dependencies = [	353	dependencies = [
354	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	354	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
355	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	355	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
356	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	356	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
357	]	357	]
358		358
359	[[package]]	359	[[package]]
@@ -443,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
443	dependencies = [	443	dependencies = [
444	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	444	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
445	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	445	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
446	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	446	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
447	"synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",	447	"synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
448	]	448	]
449		449
@@ -687,7 +687,7 @@ name = "jemalloc-sys"
687	version = "0.3.2"	687	version = "0.3.2"
688	source = "registry+https://github.com/rust-lang/crates.io-index"	688	source = "registry+https://github.com/rust-lang/crates.io-index"
689	dependencies = [	689	dependencies = [
690	"cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",	690	"cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
691	"fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",	691	"fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
692	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",	692	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
693	]	693	]
@@ -886,7 +886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
886	dependencies = [	886	dependencies = [
887	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	887	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
888	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	888	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
889	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	889	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
890	]	890	]
891		891
892	[[package]]	892	[[package]]
@@ -1006,7 +1006,7 @@ dependencies = [
1006	"proc-macro-hack 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",	1006	"proc-macro-hack 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
1007	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1007	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1008	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1008	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1009	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1009	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1010	]	1010	]
1011		1011
1012	[[package]]	1012	[[package]]
@@ -1040,7 +1040,7 @@ dependencies = [
1040	"pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",	1040	"pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1041	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1041	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1042	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1042	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1043	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1043	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1044	]	1044	]
1045		1045
1046	[[package]]	1046	[[package]]
@@ -1074,7 +1074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1074	dependencies = [	1074	dependencies = [
1075	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1075	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1076	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1076	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1077	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1077	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1078	]	1078	]
1079		1079
1080	[[package]]	1080	[[package]]
@@ -1324,7 +1324,7 @@ dependencies = [
1324	"ra_parser 0.1.0",	1324	"ra_parser 0.1.0",
1325	"ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",	1325	"ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
1326	"ra_text_edit 0.1.0",	1326	"ra_text_edit 0.1.0",
1327	"rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",	1327	"rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
1328	"smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",	1328	"smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1329	"test_utils 0.1.0",	1329	"test_utils 0.1.0",
1330	"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",	1330	"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1595,7 +1595,7 @@ dependencies = [
1595		1595
1596	[[package]]	1596	[[package]]
1597	name = "rowan"	1597	name = "rowan"
1598	version = "0.6.0-pre.1"	1598	version = "0.6.0"
1599	source = "registry+https://github.com/rust-lang/crates.io-index"	1599	source = "registry+https://github.com/rust-lang/crates.io-index"
1600	dependencies = [	1600	dependencies = [
1601	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",	1601	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1653,7 +1653,7 @@ dependencies = [
1653	"heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",	1653	"heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1654	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1654	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1655	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1655	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1656	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1656	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1657	]	1657	]
1658		1658
1659	[[package]]	1659	[[package]]
@@ -1703,7 +1703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1703	dependencies = [	1703	dependencies = [
1704	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1704	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1705	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1705	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1706	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1706	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1707	]	1707	]
1708		1708
1709	[[package]]	1709	[[package]]
@@ -1774,7 +1774,7 @@ name = "stacker"
1774	version = "0.1.5"	1774	version = "0.1.5"
1775	source = "registry+https://github.com/rust-lang/crates.io-index"	1775	source = "registry+https://github.com/rust-lang/crates.io-index"
1776	dependencies = [	1776	dependencies = [
1777	"cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",	1777	"cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
1778	"cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",	1778	"cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1779	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",	1779	"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1780	"winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",	1780	"winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1792,7 +1792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1792		1792
1793	[[package]]	1793	[[package]]
1794	name = "syn"	1794	name = "syn"
1795	version = "0.15.40"	1795	version = "0.15.42"
1796	source = "registry+https://github.com/rust-lang/crates.io-index"	1796	source = "registry+https://github.com/rust-lang/crates.io-index"
1797	dependencies = [	1797	dependencies = [
1798	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1798	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1807,7 +1807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1807	dependencies = [	1807	dependencies = [
1808	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",	1808	"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1809	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",	1809	"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
1810	"syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",	1810	"syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
1811	"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",	1811	"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1812	]	1812	]
1813		1813
@@ -2147,7 +2147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2147	"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"	2147	"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
2148	"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"	2148	"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
2149	"checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"	2149	"checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"
2150	"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"	2150	"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
2151	"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"	2151	"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
2152	"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2152	"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2153	"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2153	"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
@@ -2285,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2285	"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"	2285	"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
2286	"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"	2286	"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
2287	"checksum ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "17f52a24414403f81528b67488cf8edc4eda977d3af1646bb6b106a600ead78f"	2287	"checksum ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "17f52a24414403f81528b67488cf8edc4eda977d3af1646bb6b106a600ead78f"
2288	"checksum rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0eeee40f1a2724b7d0d9fa5f73a7804cd2f4c91b37ba9f785d429f31819d60df"	2288	"checksum rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a796c0517d6969224c42e9ef01356363b0a7c57d10ec986c9a600d075666a5ff"
2289	"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"	2289	"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
2290	"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"	2290	"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
2291	"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"	2291	"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -2310,7 +2310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2310	"checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"	2310	"checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
2311	"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"	2311	"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
2312	"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"	2312	"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
2313	"checksum syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)" = "bc945221ccf4a7e8c31222b9d1fc77aefdd6638eb901a6ce457a3dc29d4c31e8"	2313	"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e"
2314	"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"	2314	"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
2315	"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"	2315	"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
2316	"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"	2316	"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"


diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index 9ef8dee5d..19e690f9e 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-analyzer/rust-analyzer"
10	[dependencies]	10	[dependencies]
11	unicode-xid = "0.1.0"	11	unicode-xid = "0.1.0"
12	itertools = "0.8.0"	12	itertools = "0.8.0"
13	rowan = "0.6.0-pre.1"	13	rowan = "0.6.0"
14	ra_rustc_lexer = { version = "0.1.0-pre.1", features = [ "unicode-xid" ] }	14	ra_rustc_lexer = { version = "0.1.0-pre.1", features = [ "unicode-xid" ] }
15		15
16	# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here	16	# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here