Skip to content

Commit adf6c0d

Browse files
authored
Merge pull request #20703 from ShoyuVanilla/remove-chalk-solve
minor: Get rid of unused deps `chalk-solve` and `chalk-recursive`
2 parents 50bb3c5 + 3b4f5fb commit adf6c0d

File tree

4 files changed

+16
-88
lines changed

4 files changed

+16
-88
lines changed

Cargo.lock

Lines changed: 16 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ debug = 2
3737
[patch.'crates-io']
3838
# rowan = { path = "../rowan" }
3939

40-
# chalk-solve = { path = "../chalk/chalk-solve" }
4140
# chalk-ir = { path = "../chalk/chalk-ir" }
42-
# chalk-recursive = { path = "../chalk/chalk-recursive" }
4341
# chalk-derive = { path = "../chalk/chalk-derive" }
4442
# line-index = { path = "lib/line-index" }
4543
# la-arena = { path = "lib/la-arena" }
@@ -111,9 +109,7 @@ arrayvec = "0.7.6"
111109
bitflags = "2.9.1"
112110
cargo_metadata = "0.21.0"
113111
camino = "1.1.10"
114-
chalk-solve = { version = "0.104.0", default-features = false }
115112
chalk-ir = "0.104.0"
116-
chalk-recursive = { version = "0.104.0", default-features = false }
117113
chalk-derive = "0.104.0"
118114
crossbeam-channel = "0.5.15"
119115
dissimilar = "1.0.10"

crates/hir-ty/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ oorandom = "11.1.5"
2424
tracing.workspace = true
2525
rustc-hash.workspace = true
2626
scoped-tls = "1.0.1"
27-
chalk-solve.workspace = true
2827
chalk-ir.workspace = true
29-
chalk-recursive.workspace = true
3028
chalk-derive.workspace = true
3129
la-arena.workspace = true
3230
triomphe.workspace = true

crates/hir-ty/src/traits.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use core::fmt;
44
use std::hash::Hash;
55

66
use chalk_ir::{DebruijnIndex, GoalData, fold::TypeFoldable};
7-
use chalk_solve::rust_ir;
87

98
use base_db::Crate;
109
use hir_def::{BlockId, TraitId, lang_item::LangItem};
@@ -405,15 +404,6 @@ impl FnTrait {
405404
}
406405
}
407406

408-
pub const fn to_chalk_ir(self) -> rust_ir::ClosureKind {
409-
// Chalk doesn't support async fn traits.
410-
match self {
411-
FnTrait::AsyncFnOnce | FnTrait::FnOnce => rust_ir::ClosureKind::FnOnce,
412-
FnTrait::AsyncFnMut | FnTrait::FnMut => rust_ir::ClosureKind::FnMut,
413-
FnTrait::AsyncFn | FnTrait::Fn => rust_ir::ClosureKind::Fn,
414-
}
415-
}
416-
417407
pub fn method_name(self) -> Name {
418408
match self {
419409
FnTrait::FnOnce => Name::new_symbol_root(sym::call_once),

0 commit comments

Comments
 (0)