minor: Get rid of unused deps chalk-solve and chalk-recursive

This commit is contained in:
Shoyu Vanilla 2025-09-19 22:35:46 +09:00
parent 50bb3c5d82
commit 3b4f5fbd73
4 changed files with 16 additions and 88 deletions

88
Cargo.lock generated
View File

@ -279,35 +279,6 @@ dependencies = [
"chalk-derive", "chalk-derive",
] ]
[[package]]
name = "chalk-recursive"
version = "0.104.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "882959c242558cc686de7ff0aa59860295598d119e84a4b100215f44c3d606c4"
dependencies = [
"chalk-derive",
"chalk-ir",
"chalk-solve",
"rustc-hash 1.1.0",
"tracing",
]
[[package]]
name = "chalk-solve"
version = "0.104.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72860086494ccfa05bbd3779a74babb8ace27da9a0cbabffa1315223c7290927"
dependencies = [
"chalk-derive",
"chalk-ir",
"ena",
"indexmap",
"itertools 0.12.1",
"petgraph",
"rustc-hash 1.1.0",
"tracing",
]
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.42" version = "4.5.42"
@ -574,12 +545,6 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "fixedbitset"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]] [[package]]
name = "flate2" name = "flate2"
version = "1.1.2" version = "1.1.2"
@ -706,7 +671,7 @@ dependencies = [
"hir-ty", "hir-ty",
"indexmap", "indexmap",
"intern", "intern",
"itertools 0.14.0", "itertools",
"ra-ap-rustc_type_ir", "ra-ap-rustc_type_ir",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"smallvec", "smallvec",
@ -739,7 +704,7 @@ dependencies = [
"hir-expand", "hir-expand",
"indexmap", "indexmap",
"intern", "intern",
"itertools 0.14.0", "itertools",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mbe", "mbe",
"query-group-macro", "query-group-macro",
@ -773,7 +738,7 @@ dependencies = [
"either", "either",
"expect-test", "expect-test",
"intern", "intern",
"itertools 0.14.0", "itertools",
"mbe", "mbe",
"parser", "parser",
"query-group-macro", "query-group-macro",
@ -799,8 +764,6 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"chalk-derive", "chalk-derive",
"chalk-ir", "chalk-ir",
"chalk-recursive",
"chalk-solve",
"cov-mark", "cov-mark",
"either", "either",
"ena", "ena",
@ -809,7 +772,7 @@ dependencies = [
"hir-expand", "hir-expand",
"indexmap", "indexmap",
"intern", "intern",
"itertools 0.14.0", "itertools",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"oorandom", "oorandom",
"project-model", "project-model",
@ -949,7 +912,7 @@ dependencies = [
"ide-db", "ide-db",
"ide-diagnostics", "ide-diagnostics",
"ide-ssr", "ide-ssr",
"itertools 0.14.0", "itertools",
"nohash-hasher", "nohash-hasher",
"oorandom", "oorandom",
"profile", "profile",
@ -977,7 +940,7 @@ dependencies = [
"expect-test", "expect-test",
"hir", "hir",
"ide-db", "ide-db",
"itertools 0.14.0", "itertools",
"smallvec", "smallvec",
"stdx", "stdx",
"syntax", "syntax",
@ -995,7 +958,7 @@ dependencies = [
"expect-test", "expect-test",
"hir", "hir",
"ide-db", "ide-db",
"itertools 0.14.0", "itertools",
"smallvec", "smallvec",
"stdx", "stdx",
"syntax", "syntax",
@ -1018,7 +981,7 @@ dependencies = [
"fst", "fst",
"hir", "hir",
"indexmap", "indexmap",
"itertools 0.14.0", "itertools",
"line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr", "memchr",
"nohash-hasher", "nohash-hasher",
@ -1049,7 +1012,7 @@ dependencies = [
"expect-test", "expect-test",
"hir", "hir",
"ide-db", "ide-db",
"itertools 0.14.0", "itertools",
"paths", "paths",
"serde_json", "serde_json",
"stdx", "stdx",
@ -1067,7 +1030,7 @@ dependencies = [
"expect-test", "expect-test",
"hir", "hir",
"ide-db", "ide-db",
"itertools 0.14.0", "itertools",
"parser", "parser",
"syntax", "syntax",
"test-fixture", "test-fixture",
@ -1146,15 +1109,6 @@ dependencies = [
"memoffset", "memoffset",
] ]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.14.0" version = "0.14.0"
@ -1283,7 +1237,7 @@ dependencies = [
"hir-expand", "hir-expand",
"ide-db", "ide-db",
"intern", "intern",
"itertools 0.14.0", "itertools",
"proc-macro-api", "proc-macro-api",
"project-model", "project-model",
"span", "span",
@ -1640,16 +1594,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "petgraph"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
"indexmap",
]
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.16" version = "0.2.16"
@ -1784,7 +1728,7 @@ dependencies = [
"cfg", "cfg",
"expect-test", "expect-test",
"intern", "intern",
"itertools 0.14.0", "itertools",
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"paths", "paths",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
@ -2062,7 +2006,7 @@ dependencies = [
"ide-ssr", "ide-ssr",
"indexmap", "indexmap",
"intern", "intern",
"itertools 0.14.0", "itertools",
"load-cargo", "load-cargo",
"lsp-server 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", "lsp-server 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-types", "lsp-types",
@ -2400,7 +2344,7 @@ dependencies = [
"backtrace", "backtrace",
"crossbeam-channel", "crossbeam-channel",
"crossbeam-utils", "crossbeam-utils",
"itertools 0.14.0", "itertools",
"jod-thread", "jod-thread",
"libc", "libc",
"miow", "miow",
@ -2436,7 +2380,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"expect-test", "expect-test",
"itertools 0.14.0", "itertools",
"parser", "parser",
"rayon", "rayon",
"rowan", "rowan",
@ -3285,7 +3229,7 @@ dependencies = [
"edition", "edition",
"either", "either",
"flate2", "flate2",
"itertools 0.14.0", "itertools",
"proc-macro2", "proc-macro2",
"quote", "quote",
"stdx", "stdx",

View File

@ -37,9 +37,7 @@ debug = 2
[patch.'crates-io'] [patch.'crates-io']
# rowan = { path = "../rowan" } # rowan = { path = "../rowan" }
# chalk-solve = { path = "../chalk/chalk-solve" }
# chalk-ir = { path = "../chalk/chalk-ir" } # chalk-ir = { path = "../chalk/chalk-ir" }
# chalk-recursive = { path = "../chalk/chalk-recursive" }
# chalk-derive = { path = "../chalk/chalk-derive" } # chalk-derive = { path = "../chalk/chalk-derive" }
# line-index = { path = "lib/line-index" } # line-index = { path = "lib/line-index" }
# la-arena = { path = "lib/la-arena" } # la-arena = { path = "lib/la-arena" }
@ -111,9 +109,7 @@ arrayvec = "0.7.6"
bitflags = "2.9.1" bitflags = "2.9.1"
cargo_metadata = "0.21.0" cargo_metadata = "0.21.0"
camino = "1.1.10" camino = "1.1.10"
chalk-solve = { version = "0.104.0", default-features = false }
chalk-ir = "0.104.0" chalk-ir = "0.104.0"
chalk-recursive = { version = "0.104.0", default-features = false }
chalk-derive = "0.104.0" chalk-derive = "0.104.0"
crossbeam-channel = "0.5.15" crossbeam-channel = "0.5.15"
dissimilar = "1.0.10" dissimilar = "1.0.10"

View File

@ -24,9 +24,7 @@ oorandom = "11.1.5"
tracing.workspace = true tracing.workspace = true
rustc-hash.workspace = true rustc-hash.workspace = true
scoped-tls = "1.0.1" scoped-tls = "1.0.1"
chalk-solve.workspace = true
chalk-ir.workspace = true chalk-ir.workspace = true
chalk-recursive.workspace = true
chalk-derive.workspace = true chalk-derive.workspace = true
la-arena.workspace = true la-arena.workspace = true
triomphe.workspace = true triomphe.workspace = true

View File

@ -4,7 +4,6 @@ use core::fmt;
use std::hash::Hash; use std::hash::Hash;
use chalk_ir::{DebruijnIndex, GoalData, fold::TypeFoldable}; use chalk_ir::{DebruijnIndex, GoalData, fold::TypeFoldable};
use chalk_solve::rust_ir;
use base_db::Crate; use base_db::Crate;
use hir_def::{BlockId, TraitId, lang_item::LangItem}; use hir_def::{BlockId, TraitId, lang_item::LangItem};
@ -405,15 +404,6 @@ impl FnTrait {
} }
} }
pub const fn to_chalk_ir(self) -> rust_ir::ClosureKind {
// Chalk doesn't support async fn traits.
match self {
FnTrait::AsyncFnOnce | FnTrait::FnOnce => rust_ir::ClosureKind::FnOnce,
FnTrait::AsyncFnMut | FnTrait::FnMut => rust_ir::ClosureKind::FnMut,
FnTrait::AsyncFn | FnTrait::Fn => rust_ir::ClosureKind::Fn,
}
}
pub fn method_name(self) -> Name { pub fn method_name(self) -> Name {
match self { match self {
FnTrait::FnOnce => Name::new_symbol_root(sym::call_once), FnTrait::FnOnce => Name::new_symbol_root(sym::call_once),