diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-18 00:53:42 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-18 00:53:42 +0100 |
commit | 7c4bb971456649ab18a5dadd355a96d53cb72ed1 (patch) | |
tree | 0413c1861053719a5099fde8377f78c01627ddcf | |
parent | aed7b6d98aab8c222124d336b69f83ed4f1dfb2d (diff) | |
parent | 6c7769a2e3d1fc7de3b654d739558cea8b4c169d (diff) |
Merge #6272
6272: :arrow_up: xshell r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | Cargo.lock | 16 | ||||
-rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 |
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]] |
364 | name = "env_logger" | 364 | name = "env_logger" |
365 | version = "0.7.1" | 365 | version = "0.8.1" |
366 | source = "registry+https://github.com/rust-lang/crates.io-index" | 366 | source = "registry+https://github.com/rust-lang/crates.io-index" |
367 | checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" | 367 | checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd" |
368 | dependencies = [ | 368 | dependencies = [ |
369 | "log", | 369 | "log", |
370 | ] | 370 | ] |
@@ -1532,9 +1532,9 @@ version = "0.0.0" | |||
1532 | 1532 | ||
1533 | [[package]] | 1533 | [[package]] |
1534 | name = "syn" | 1534 | name = "syn" |
1535 | version = "1.0.44" | 1535 | version = "1.0.45" |
1536 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1536 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1537 | checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" | 1537 | checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556" |
1538 | dependencies = [ | 1538 | dependencies = [ |
1539 | "proc-macro2", | 1539 | "proc-macro2", |
1540 | "quote", | 1540 | "quote", |
@@ -1916,18 +1916,18 @@ dependencies = [ | |||
1916 | 1916 | ||
1917 | [[package]] | 1917 | [[package]] |
1918 | name = "xshell" | 1918 | name = "xshell" |
1919 | version = "0.1.2" | 1919 | version = "0.1.5" |
1920 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1920 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1921 | checksum = "3e52c34730b631e3aea95f5f650e7457a9219f4c62df9ed2d1106ddacb0d54e2" | 1921 | checksum = "61df06d11158eb34971a4e44904defd3419f625b7d9fb0e8b0817b0623e0daae" |
1922 | dependencies = [ | 1922 | dependencies = [ |
1923 | "xshell-macros", | 1923 | "xshell-macros", |
1924 | ] | 1924 | ] |
1925 | 1925 | ||
1926 | [[package]] | 1926 | [[package]] |
1927 | name = "xshell-macros" | 1927 | name = "xshell-macros" |
1928 | version = "0.1.2" | 1928 | version = "0.1.5" |
1929 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1929 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1930 | checksum = "495f6e94cc76a22553d2a49188d7d49155c87d4b82414b749b121d69aa9c0240" | 1930 | checksum = "40bef8018dc67100c99ee2f9866451e9d196a7effa9e40646717545a2ee42691" |
1931 | 1931 | ||
1932 | [[package]] | 1932 | [[package]] |
1933 | name = "xtask" | 1933 | name = "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] |
18 | anyhow = "1.0.26" | 18 | anyhow = "1.0.26" |
19 | crossbeam-channel = "0.5.0" | 19 | crossbeam-channel = "0.5.0" |
20 | env_logger = { version = "0.7.1", default-features = false } | 20 | env_logger = { version = "0.8.1", default-features = false } |
21 | itertools = "0.9.0" | 21 | itertools = "0.9.0" |
22 | jod-thread = "0.1.0" | 22 | jod-thread = "0.1.0" |
23 | log = "0.4.8" | 23 | log = "0.4.8" |