Merge #8866

8866: Update salsa r=matklad a=jonas-schievink This updates salsa to include https://github.com/salsa-rs/salsa/pull/265, and removes all cancellation-related code from rust-analyzer Co-authored-by: Jonas Schievink <[email protected]>
author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2021-05-31 13:42:32 +0100
committer: GitHub <[email protected]> 2021-05-31 13:42:32 +0100
commit: e9a797748daa7e25cde66927b8907b2d976201a5 (patch)
tree: 438bb6e1a2c5e422ee18994d2e045480b429d549 /Cargo.lock
parent: b8d269990c57634e77f4702afc91041bacb4816a (diff)
parent: acb5c227ed2d2d52d67ab56a61e6944cd4d5de88 (diff)
1 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 15ccf4146..ee04cdce8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1375,9 +1375,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 [[package]]
 name = "salsa"
-version = "0.16.1"
+version = "0.17.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403"
+checksum = "58038261ea8cd5a7730c4d8c97a22063d7c7eb1c2809e55c3c15f0a5903e5582"
 dependencies = [
 "crossbeam-utils",
 "indexmap",
@@ -1392,9 +1392,9 @@ dependencies = [
 [[package]]
 name = "salsa-macros"
-version = "0.16.0"
+version = "0.17.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2"
+checksum = "2e2fc060627fa5d44bffac98f6089b9497779e2deccc26687f60adc2638e32fb"
 dependencies = [
 "heck",
 "proc-macro2",
author	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2021-05-31 13:42:32 +0100
committer	GitHub <[email protected]>	2021-05-31 13:42:32 +0100
commit	e9a797748daa7e25cde66927b8907b2d976201a5 (patch)
tree	438bb6e1a2c5e422ee18994d2e045480b429d549 /Cargo.lock
parent	b8d269990c57634e77f4702afc91041bacb4816a (diff)
parent	acb5c227ed2d2d52d67ab56a61e6944cd4d5de88 (diff)

diff --git a/Cargo.lock b/Cargo.lock index 15ccf4146..ee04cdce8 100644 --- a/Cargo.lock +++ b/Cargo.lock
@@ -1375,9 +1375,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
1375		1375
1376	[[package]]	1376	[[package]]
1377	name = "salsa"	1377	name = "salsa"
1378	version = "0.16.1"	1378	version = "0.17.0-pre.1"
1379	source = "registry+https://github.com/rust-lang/crates.io-index"	1379	source = "registry+https://github.com/rust-lang/crates.io-index"
1380	checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403"	1380	checksum = "58038261ea8cd5a7730c4d8c97a22063d7c7eb1c2809e55c3c15f0a5903e5582"
1381	dependencies = [	1381	dependencies = [
1382	"crossbeam-utils",	1382	"crossbeam-utils",
1383	"indexmap",	1383	"indexmap",
@@ -1392,9 +1392,9 @@ dependencies = [
1392		1392
1393	[[package]]	1393	[[package]]
1394	name = "salsa-macros"	1394	name = "salsa-macros"
1395	version = "0.16.0"	1395	version = "0.17.0-pre.1"
1396	source = "registry+https://github.com/rust-lang/crates.io-index"	1396	source = "registry+https://github.com/rust-lang/crates.io-index"
1397	checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2"	1397	checksum = "2e2fc060627fa5d44bffac98f6089b9497779e2deccc26687f60adc2638e32fb"
1398	dependencies = [	1398	dependencies = [
1399	"heck",	1399	"heck",
1400	"proc-macro2",	1400	"proc-macro2",