aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-22 18:25:16 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-22 18:25:16 +0100
commit08efe6cf92e7058ba38833dbfab8940a57a2cbfe (patch)
tree395b1778ca3af492fbde3d0b8145c80cfba57cd0
parent8522504d51b628ff3236c542f2eba0efd1c0d5bb (diff)
parentce77291ca4952796ea1690b5147e1bb0ab34170b (diff)
Merge #1579
1579: flexi_logger 0.14 r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]>
-rw-r--r--Cargo.lock10
-rw-r--r--crates/gen_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_cli/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
4 files changed, 8 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4ba079570..7c7836a13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,7 +469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
469 469
470[[package]] 470[[package]]
471name = "flexi_logger" 471name = "flexi_logger"
472version = "0.13.4" 472version = "0.14.0"
473source = "registry+https://github.com/rust-lang/crates.io-index" 473source = "registry+https://github.com/rust-lang/crates.io-index"
474dependencies = [ 474dependencies = [
475 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 475 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -538,7 +538,7 @@ name = "gen_lsp_server"
538version = "0.2.0" 538version = "0.2.0"
539dependencies = [ 539dependencies = [
540 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", 540 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
541 "flexi_logger 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", 541 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
542 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 542 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
543 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)", 543 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
544 "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", 544 "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1154,7 +1154,7 @@ name = "ra_cli"
1154version = "0.1.0" 1154version = "0.1.0"
1155dependencies = [ 1155dependencies = [
1156 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", 1156 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
1157 "flexi_logger 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", 1157 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
1158 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 1158 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
1159 "ra_batch 0.1.0", 1159 "ra_batch 0.1.0",
1160 "ra_db 0.1.0", 1160 "ra_db 0.1.0",
@@ -1240,7 +1240,7 @@ name = "ra_lsp_server"
1240version = "0.1.0" 1240version = "0.1.0"
1241dependencies = [ 1241dependencies = [
1242 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", 1242 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
1243 "flexi_logger 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", 1243 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
1244 "gen_lsp_server 0.2.0", 1244 "gen_lsp_server 0.2.0",
1245 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 1245 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
1246 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)", 1246 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2184,7 +2184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2184"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" 2184"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
2185"checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d" 2185"checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d"
2186"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" 2186"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
2187"checksum flexi_logger 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)" = "85f80d16fde95e0f424de0b523d40278fd66925a81247246963fcdf1f390f9fb" 2187"checksum flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c33205472cdf9f0626ff7c058d4b9cbef51673ceaf1169e54d4be49133cbab2"
2188"checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53" 2188"checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53"
2189"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" 2189"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
2190"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" 2190"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index 36a29265c..d0ca19f52 100644
--- a/crates/gen_lsp_server/Cargo.toml
+++ b/crates/gen_lsp_server/Cargo.toml
@@ -15,4 +15,4 @@ serde = { version = "1.0.83", features = ["derive"] }
15crossbeam-channel = "0.3.5" 15crossbeam-channel = "0.3.5"
16 16
17[dev-dependencies] 17[dev-dependencies]
18flexi_logger = "0.13.0" 18flexi_logger = "0.14.0"
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 4d9c41ae9..970cb1f82 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
7 7
8[dependencies] 8[dependencies]
9clap = "2.32.0" 9clap = "2.32.0"
10flexi_logger = "0.13.0" 10flexi_logger = "0.14.0"
11indicatif = "0.11.0" 11indicatif = "0.11.0"
12 12
13ra_syntax = { path = "../ra_syntax" } 13ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index e73e0b419..cec360667 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -10,7 +10,7 @@ relative-path = "0.4.0"
10serde_json = "1.0.34" 10serde_json = "1.0.34"
11serde = { version = "1.0.83", features = ["derive"] } 11serde = { version = "1.0.83", features = ["derive"] }
12crossbeam-channel = "0.3.5" 12crossbeam-channel = "0.3.5"
13flexi_logger = "0.13.0" 13flexi_logger = "0.14.0"
14log = "0.4.3" 14log = "0.4.3"
15url_serde = "0.2.0" 15url_serde = "0.2.0"
16lsp-types = { version = "0.59.0", features = ["proposed"] } 16lsp-types = { version = "0.59.0", features = ["proposed"] }