Skip to content

Commit f9fea17

Browse files
committed
Auto merge of #9030 - Serial-ATA:remove-clippy-dev-dep, r=flip1995
Remove `cargo_dev` dependency changelog: none Sorry about that 😅. r? `@flip1995`
2 parents bc0bf06 + 890fd0e commit f9fea17

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

clippy_lints/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ edition = "2021"
1010

1111
[dependencies]
1212
cargo_metadata = "0.14"
13-
clippy_dev = { path = "../clippy_dev", optional = true }
1413
clippy_utils = { path = "../clippy_utils" }
1514
if_chain = "1.0"
1615
itertools = "0.10.1"
@@ -32,7 +31,7 @@ url = { version = "2.2", features = ["serde"] }
3231
[features]
3332
deny-warnings = ["clippy_utils/deny-warnings"]
3433
# build clippy with internal lints enabled, off by default
35-
internal = ["clippy_utils/internal", "serde_json", "tempfile", "clippy_dev"]
34+
internal = ["clippy_utils/internal", "serde_json", "tempfile"]
3635

3736
[package.metadata.rust-analyzer]
3837
# This crate uses #[feature(rustc_private)]

clippy_lints/src/utils/internal_lints/metadata_collector.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,12 @@ impl MetadataCollector {
191191
lints: BinaryHeap::<LintMetadata>::default(),
192192
applicability_info: FxHashMap::<String, ApplicabilityInfo>::default(),
193193
config: collect_configs(),
194-
clippy_project_root: clippy_dev::clippy_project_root(),
194+
clippy_project_root: std::env::current_dir()
195+
.expect("failed to get current dir")
196+
.ancestors()
197+
.nth(1)
198+
.expect("failed to get project root")
199+
.to_path_buf(),
195200
}
196201
}
197202

0 commit comments

Comments
 (0)