From 852b2481a437ac693f859d147750b80b531ce85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 16:46:22 +0300
Subject: [PATCH 1/6] Remove Cargo.lock comment
---
Cargo.lock | 1 -
1 file changed, 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
index 320f70529f6..fdb62e6ea42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,5 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-# asdasdasdasd
[[package]]
name = "addr2line"
version = "0.13.0"
From c6605affe4efe39d9c83e97b428e1de4bdcda81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 16:46:36 +0300
Subject: [PATCH 2/6] Bump some deps
---
Cargo.lock | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index fdb62e6ea42..0d0302f0e6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -129,9 +129,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "cargo_metadata"
-version = "0.11.3"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e708746e51dfaeff27c6c3979a4005a7faddabe40144204a0b1ce5ad34a1d0a5"
+checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec"
dependencies = [
"semver",
"serde",
@@ -1223,9 +1223,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "regex"
-version = "1.3.9"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "36f45b719a674bf4b828ff318906d6c133264c793eff7a41e30074a45b5099e2"
dependencies = [
"regex-syntax",
]
@@ -1242,9 +1242,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "c17be88d9eaa858870aa5e48cc406c206e4600e983fc4f06bbe5750d93d09761"
[[package]]
name = "rowan"
@@ -1439,9 +1439,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.58"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
+checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
dependencies = [
"itoa",
"ryu",
From db7813ef2c58caeef342fd007aa2d54b581b78b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 16:57:01 +0300
Subject: [PATCH 3/6] Bump crossbeam-channel in crates
---
Cargo.lock | 52 ++++++++++++++++++++++++--------
crates/flycheck/Cargo.toml | 2 +-
crates/proc_macro_api/Cargo.toml | 2 +-
crates/vfs-notify/Cargo.toml | 2 +-
4 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0d0302f0e6c..5506163edcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -249,6 +249,12 @@ dependencies = [
"cc",
]
+[[package]]
+name = "const_fn"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
+
[[package]]
name = "crc32fast"
version = "1.2.0"
@@ -264,10 +270,20 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
"maybe-uninit",
]
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.0",
+]
+
[[package]]
name = "crossbeam-deque"
version = "0.7.3"
@@ -275,7 +291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
"crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
"maybe-uninit",
]
@@ -287,7 +303,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
"autocfg",
"cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
"lazy_static",
"maybe-uninit",
"memoffset",
@@ -305,6 +321,18 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "const_fn",
+ "lazy_static",
+]
+
[[package]]
name = "difference"
version = "2.0.0"
@@ -386,7 +414,7 @@ name = "flycheck"
version = "0.0.0"
dependencies = [
"cargo_metadata",
- "crossbeam-channel",
+ "crossbeam-channel 0.5.0",
"jod-thread",
"log",
"serde_json",
@@ -778,7 +806,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87fce8851309a325974ec76efe7c9d954d152c9ff4fded6520eb3c96d0aa3a96"
dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.4.4",
"log",
"serde",
"serde_json",
@@ -938,7 +966,7 @@ checksum = "77d03607cf88b4b160ba0e9ed425fff3cee3b55ac813f0c685b3a3772da37d0e"
dependencies = [
"anymap",
"bitflags",
- "crossbeam-channel",
+ "crossbeam-channel 0.4.4",
"filetime",
"fsevent",
"fsevent-sys",
@@ -1100,7 +1128,7 @@ dependencies = [
name = "proc_macro_api"
version = "0.0.0"
dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.5.0",
"jod-thread",
"log",
"serde",
@@ -1208,9 +1236,9 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.4.4",
"crossbeam-deque",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
"lazy_static",
"num_cpus",
]
@@ -1265,7 +1293,7 @@ dependencies = [
"anyhow",
"base_db",
"cfg",
- "crossbeam-channel",
+ "crossbeam-channel 0.4.4",
"env_logger",
"expect-test",
"flycheck",
@@ -1337,7 +1365,7 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ab29056d4fb4048a5f0d169c9b6e5526160c9ec37aded5a6879c2c9c445a8e4"
dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
"indexmap",
"lock_api",
"log",
@@ -1806,7 +1834,7 @@ dependencies = [
name = "vfs-notify"
version = "0.0.0"
dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.5.0",
"jod-thread",
"log",
"notify",
diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml
index c230fc1e26e..4e2b60b73c2 100644
--- a/crates/flycheck/Cargo.toml
+++ b/crates/flycheck/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
doctest = false
[dependencies]
-crossbeam-channel = "0.4.0"
+crossbeam-channel = "0.5.0"
log = "0.4.8"
cargo_metadata = "0.11.1"
serde_json = "1.0.48"
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml
index 75f67a22ed5..3863e51895d 100644
--- a/crates/proc_macro_api/Cargo.toml
+++ b/crates/proc_macro_api/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
log = "0.4.8"
-crossbeam-channel = "0.4.0"
+crossbeam-channel = "0.5.0"
jod-thread = "0.1.1"
tt = { path = "../tt", version = "0.0.0" }
diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml
index 54b51faab2e..5b7c33b01c4 100644
--- a/crates/vfs-notify/Cargo.toml
+++ b/crates/vfs-notify/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4.8"
rustc-hash = "1.0"
jod-thread = "0.1.0"
walkdir = "2.3.1"
-crossbeam-channel = "0.4.0"
+crossbeam-channel = "0.5.0"
notify = "5.0.0-pre.3"
vfs = { path = "../vfs", version = "0.0.0" }
From 017a04f424dcc30f54c63138eefbc23811082a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 18:05:06 +0300
Subject: [PATCH 4/6] Bump crossbeam-channel and lsp-server in rust-analyzer
---
Cargo.lock | 8 ++++----
crates/rust-analyzer/Cargo.toml | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5506163edcc..a6d3d17af05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -802,11 +802,11 @@ dependencies = [
[[package]]
name = "lsp-server"
-version = "0.3.4"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fce8851309a325974ec76efe7c9d954d152c9ff4fded6520eb3c96d0aa3a96"
+checksum = "ff7452ee21b8de64f10ceb4e9fee1212e1a9579cd717226613333e751676c86a"
dependencies = [
- "crossbeam-channel 0.4.4",
+ "crossbeam-channel 0.5.0",
"log",
"serde",
"serde_json",
@@ -1293,7 +1293,7 @@ dependencies = [
"anyhow",
"base_db",
"cfg",
- "crossbeam-channel 0.4.4",
+ "crossbeam-channel 0.5.0",
"env_logger",
"expect-test",
"flycheck",
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 631ffc4a72b..df2ea6f85e6 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/bin/main.rs"
[dependencies]
anyhow = "1.0.26"
-crossbeam-channel = "0.4.0"
+crossbeam-channel = "0.5.0"
env_logger = { version = "0.7.1", default-features = false }
itertools = "0.9.0"
jod-thread = "0.1.0"
@@ -31,7 +31,7 @@ serde_json = "1.0.48"
threadpool = "1.7.1"
rayon = "1.3.1"
mimalloc = { version = "0.1.19", default-features = false, optional = true }
-lsp-server = "0.3.3"
+lsp-server = "0.4.0"
stdx = { path = "../stdx", version = "0.0.0" }
flycheck = { path = "../flycheck", version = "0.0.0" }
From 9937c0d50a8d5a08394c40b97f23d826e7445945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 18:06:23 +0300
Subject: [PATCH 5/6] Bump rustc_lexer
---
Cargo.lock | 4 ++--
crates/syntax/Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index a6d3d17af05..faa4bacee80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1334,9 +1334,9 @@ dependencies = [
[[package]]
name = "rustc-ap-rustc_lexer"
-version = "682.0.0"
+version = "683.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fea544ba13e72077e363981b0a4a87997b97f772b25a0aa7ec3df35a6adfe82"
+checksum = "c0c9a47e24d4b7d74ec583d8813803b36985ee082fe7debe55f257df92d5fe50"
dependencies = [
"unicode-xid",
]
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 547fe9f4704..c343f2f70a0 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 = "682.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "683.0.0", package = "rustc-ap-rustc_lexer" }
rustc-hash = "1.1.0"
arrayvec = "0.5.1"
once_cell = "1.3.1"
From baf84d4a935a4cc6a8259deb52ac7a177038fbe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Oct 2020 18:06:40 +0300
Subject: [PATCH 6/6] Bump regex
---
Cargo.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index faa4bacee80..b890b6e19f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1251,9 +1251,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "regex"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f45b719a674bf4b828ff318906d6c133264c793eff7a41e30074a45b5099e2"
+checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b"
dependencies = [
"regex-syntax",
]
@@ -1270,9 +1270,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.19"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17be88d9eaa858870aa5e48cc406c206e4600e983fc4f06bbe5750d93d09761"
+checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
[[package]]
name = "rowan"