about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-06-08 15:48:58 +0000
committerbors <bors@rust-lang.org>2023-06-08 15:48:58 +0000
commit9c03aa1ac2e67051db83a85baf3cfee902e4dd84 (patch)
tree399997e4bf3b9c4cdf86c6a63cab87e402bff70c
parent91579277723bfd7ed2cd32b81a90eae78d8c9163 (diff)
parent08ef169435378b7d49e9f7d7d7ef81abd2171eb2 (diff)
downloadrust-9c03aa1ac2e67051db83a85baf3cfee902e4dd84.tar.gz
rust-9c03aa1ac2e67051db83a85baf3cfee902e4dd84.zip
Auto merge of #14997 - lnicola:fix-warning, r=Veykril
internal: Fix dependency warning

Hope this doesn't break #14984 again.
-rw-r--r--Cargo.lock1
-rw-r--r--crates/rust-analyzer/Cargo.toml3
2 files changed, 1 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e36aef6a6aa..322a67383b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1505,7 +1505,6 @@ dependencies = [
  "parking_lot 0.12.1",
  "parking_lot_core 0.9.6",
  "proc-macro-api",
- "proc-macro-srv-cli",
  "profile",
  "project-model",
  "rayon",
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 77f02a83101..5b72d57560b 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -68,7 +68,6 @@ ide-db.workspace = true
 ide-ssr.workspace = true
 ide.workspace = true
 proc-macro-api.workspace = true
-proc-macro-srv-cli.workspace = true
 profile.workspace = true
 project-model.workspace = true
 stdx.workspace = true
@@ -95,5 +94,5 @@ mbe.workspace = true
 [features]
 jemalloc = ["jemallocator", "profile/jemalloc"]
 force-always-assert = ["always-assert/force"]
-sysroot-abi = ["proc-macro-srv-cli/sysroot-abi"]
+sysroot-abi = []
 in-rust-tree = ["sysroot-abi", "ide/in-rust-tree", "syntax/in-rust-tree"]