aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-27 09:40:52 +0000
committerGitHub <[email protected]>2021-01-27 09:40:52 +0000
commit34fb643f13cda3a6eb2543a15c70719d7518ee3a (patch)
treed1e629efc60dbcceae891681abdece7574c2d1c7
parent2d3266d11145b907c554428f5af5d24d69591f92 (diff)
parent5101f85da06bb467bfec0cec5e96267ad282456c (diff)
Merge #7461
7461: Squelch a warning r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock4
-rw-r--r--crates/profile/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/bin/args.rs1
3 files changed, 4 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 45a0211ff..6fcac6177 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -284,9 +284,9 @@ checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
284 284
285[[package]] 285[[package]]
286name = "countme" 286name = "countme"
287version = "2.0.0" 287version = "2.0.1"
288source = "registry+https://github.com/rust-lang/crates.io-index" 288source = "registry+https://github.com/rust-lang/crates.io-index"
289checksum = "4f8038ded86523aa26c1321dfe8bb432707d0a3e2608f9d0108803727546e089" 289checksum = "1aa2b26822354da8572983762d79a7ba55981b3fbbc612164a0dbbd0213df7fe"
290dependencies = [ 290dependencies = [
291 "dashmap", 291 "dashmap",
292 "once_cell", 292 "once_cell",
diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
index 4dd9acc98..486f9c164 100644
--- a/crates/profile/Cargo.toml
+++ b/crates/profile/Cargo.toml
@@ -14,7 +14,7 @@ once_cell = "1.3.1"
14cfg-if = "1" 14cfg-if = "1"
15libc = "0.2.73" 15libc = "0.2.73"
16la-arena = { version = "0.2.0", path = "../../lib/arena" } 16la-arena = { version = "0.2.0", path = "../../lib/arena" }
17countme = { version = "2.0.0", features = ["enable"] } 17countme = { version = "2.0.1", features = ["enable"] }
18jemalloc-ctl = { version = "0.3.3", optional = true } 18jemalloc-ctl = { version = "0.3.3", optional = true }
19 19
20[target.'cfg(target_os = "linux")'.dependencies] 20[target.'cfg(target_os = "linux")'.dependencies]
diff --git a/crates/rust-analyzer/src/bin/args.rs b/crates/rust-analyzer/src/bin/args.rs
index 37d8414f4..2a532361d 100644
--- a/crates/rust-analyzer/src/bin/args.rs
+++ b/crates/rust-analyzer/src/bin/args.rs
@@ -16,6 +16,7 @@ pub(crate) struct Args {
16 pub(crate) log_file: Option<PathBuf>, 16 pub(crate) log_file: Option<PathBuf>,
17 pub(crate) no_buffering: bool, 17 pub(crate) no_buffering: bool,
18 pub(crate) command: Command, 18 pub(crate) command: Command,
19 #[allow(unused)]
19 pub(crate) wait_dbg: bool, 20 pub(crate) wait_dbg: bool,
20} 21}
21 22