aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-10-18 00:53:42 +0100
committerGitHub <[email protected]>2020-10-18 00:53:42 +0100
commit7c4bb971456649ab18a5dadd355a96d53cb72ed1 (patch)
tree0413c1861053719a5099fde8377f78c01627ddcf
parentaed7b6d98aab8c222124d336b69f83ed4f1dfb2d (diff)
parent6c7769a2e3d1fc7de3b654d739558cea8b4c169d (diff)
Merge #6272
6272: :arrow_up: xshell r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock16
-rw-r--r--crates/rust-analyzer/Cargo.toml2
2 files changed, 9 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock
index fa56ea3be..c724d1348 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,9 +362,9 @@ dependencies = [
362 362
363[[package]] 363[[package]]
364name = "env_logger" 364name = "env_logger"
365version = "0.7.1" 365version = "0.8.1"
366source = "registry+https://github.com/rust-lang/crates.io-index" 366source = "registry+https://github.com/rust-lang/crates.io-index"
367checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" 367checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd"
368dependencies = [ 368dependencies = [
369 "log", 369 "log",
370] 370]
@@ -1532,9 +1532,9 @@ version = "0.0.0"
1532 1532
1533[[package]] 1533[[package]]
1534name = "syn" 1534name = "syn"
1535version = "1.0.44" 1535version = "1.0.45"
1536source = "registry+https://github.com/rust-lang/crates.io-index" 1536source = "registry+https://github.com/rust-lang/crates.io-index"
1537checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" 1537checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556"
1538dependencies = [ 1538dependencies = [
1539 "proc-macro2", 1539 "proc-macro2",
1540 "quote", 1540 "quote",
@@ -1916,18 +1916,18 @@ dependencies = [
1916 1916
1917[[package]] 1917[[package]]
1918name = "xshell" 1918name = "xshell"
1919version = "0.1.2" 1919version = "0.1.5"
1920source = "registry+https://github.com/rust-lang/crates.io-index" 1920source = "registry+https://github.com/rust-lang/crates.io-index"
1921checksum = "3e52c34730b631e3aea95f5f650e7457a9219f4c62df9ed2d1106ddacb0d54e2" 1921checksum = "61df06d11158eb34971a4e44904defd3419f625b7d9fb0e8b0817b0623e0daae"
1922dependencies = [ 1922dependencies = [
1923 "xshell-macros", 1923 "xshell-macros",
1924] 1924]
1925 1925
1926[[package]] 1926[[package]]
1927name = "xshell-macros" 1927name = "xshell-macros"
1928version = "0.1.2" 1928version = "0.1.5"
1929source = "registry+https://github.com/rust-lang/crates.io-index" 1929source = "registry+https://github.com/rust-lang/crates.io-index"
1930checksum = "495f6e94cc76a22553d2a49188d7d49155c87d4b82414b749b121d69aa9c0240" 1930checksum = "40bef8018dc67100c99ee2f9866451e9d196a7effa9e40646717545a2ee42691"
1931 1931
1932[[package]] 1932[[package]]
1933name = "xtask" 1933name = "xtask"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index df2ea6f85..66cf06e1a 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/bin/main.rs"
17[dependencies] 17[dependencies]
18anyhow = "1.0.26" 18anyhow = "1.0.26"
19crossbeam-channel = "0.5.0" 19crossbeam-channel = "0.5.0"
20env_logger = { version = "0.7.1", default-features = false } 20env_logger = { version = "0.8.1", default-features = false }
21itertools = "0.9.0" 21itertools = "0.9.0"
22jod-thread = "0.1.0" 22jod-thread = "0.1.0"
23log = "0.4.8" 23log = "0.4.8"