Skip to content

Commit 820eabe

Browse files
AzureMarkerAzureMarker
committed
Fix tests in chalk-solve from referencing old interner module
1 parent 22b6c49 commit 820eabe

File tree

6 files changed

+30
-26
lines changed

6 files changed

+30
-26
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chalk-ir/src/macros.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,41 @@ macro_rules! ty {
55
(apply $n:tt $($arg:tt)*) => {
66
$crate::TyData::Apply(ApplicationTy {
77
name: ty_name!($n),
8-
substitution: $crate::Substitution::from(&chalk_ir::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
9-
}).intern(&chalk_ir::interner::ChalkIr)
8+
substitution: $crate::Substitution::from(&chalk_integration::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
9+
}).intern(&chalk_integration::interner::ChalkIr)
1010
};
1111

1212
(function $n:tt $($arg:tt)*) => {
1313
$crate::TyData::Function(Fn {
1414
num_binders: $n,
15-
substitution: $crate::Substitution::from(&chalk_ir::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
16-
}).intern(&chalk_ir::interner::ChalkIr)
15+
substitution: $crate::Substitution::from(&chalk_integration::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
16+
}).intern(&chalk_integration::interner::ChalkIr)
1717
};
1818

1919
(placeholder $n:expr) => {
2020
$crate::TyData::Placeholder(PlaceholderIndex {
2121
ui: UniverseIndex { counter: $n },
2222
idx: 0,
23-
}).intern(&chalk_ir::interner::ChalkIr)
23+
}).intern(&chalk_integration::interner::ChalkIr)
2424
};
2525

2626
(projection (item $n:tt) $($arg:tt)*) => {
2727
chalk_ir::AliasTy::Projection(chalk_ir::ProjectionTy {
28-
associated_ty_id: AssocTypeId(chalk_ir::interner::RawId { index: $n }),
29-
substitution: $crate::Substitution::from(&chalk_ir::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
30-
}).intern(&chalk_ir::interner::ChalkIr)
28+
associated_ty_id: AssocTypeId(chalk_integration::interner::RawId { index: $n }),
29+
substitution: $crate::Substitution::from(&chalk_integration::interner::ChalkIr, vec![$(arg!($arg)),*] as Vec<$crate::Parameter<_>>),
30+
}).intern(&chalk_integration::interner::ChalkIr)
3131
};
3232

3333
(infer $b:expr) => {
34-
$crate::TyData::InferenceVar($crate::InferenceVar::from($b)).intern(&chalk_ir::interner::ChalkIr)
34+
$crate::TyData::InferenceVar($crate::InferenceVar::from($b)).intern(&chalk_integration::interner::ChalkIr)
3535
};
3636

3737
(bound $d:tt $b:tt) => {
38-
$crate::TyData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::new($d), $b)).intern(&chalk_ir::interner::ChalkIr)
38+
$crate::TyData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::new($d), $b)).intern(&chalk_integration::interner::ChalkIr)
3939
};
4040

4141
(bound $b:expr) => {
42-
$crate::TyData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::INNERMOST, $b)).intern(&chalk_ir::interner::ChalkIr)
42+
$crate::TyData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::INNERMOST, $b)).intern(&chalk_integration::interner::ChalkIr)
4343
};
4444

4545
(expr $b:expr) => {
@@ -55,14 +55,14 @@ macro_rules! ty {
5555
macro_rules! arg {
5656
((lifetime $b:tt)) => {
5757
$crate::Parameter::new(
58-
&chalk_ir::interner::ChalkIr,
58+
&chalk_integration::interner::ChalkIr,
5959
$crate::ParameterKind::Lifetime(lifetime!($b)),
6060
)
6161
};
6262

6363
($arg:tt) => {
6464
$crate::Parameter::new(
65-
&chalk_ir::interner::ChalkIr,
65+
&chalk_integration::interner::ChalkIr,
6666
$crate::ParameterKind::Ty(ty!($arg)),
6767
)
6868
};
@@ -71,19 +71,19 @@ macro_rules! arg {
7171
#[macro_export]
7272
macro_rules! lifetime {
7373
(infer $b:expr) => {
74-
$crate::LifetimeData::InferenceVar($crate::InferenceVar::from($b)).intern(&chalk_ir::interner::ChalkIr)
74+
$crate::LifetimeData::InferenceVar($crate::InferenceVar::from($b)).intern(&chalk_integration::interner::ChalkIr)
7575
};
7676

7777
(bound $d:tt $b:tt) => {
78-
$crate::LifetimeData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::new($d), $b)).intern(&chalk_ir::interner::ChalkIr)
78+
$crate::LifetimeData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::new($d), $b)).intern(&chalk_integration::interner::ChalkIr)
7979
};
8080

8181
(bound $b:expr) => {
82-
$crate::LifetimeData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::INNERMOST, $b)).intern(&chalk_ir::interner::ChalkIr)
82+
$crate::LifetimeData::BoundVar($crate::BoundVar::new($crate::DebruijnIndex::INNERMOST, $b)).intern(&chalk_integration::interner::ChalkIr)
8383
};
8484

8585
(placeholder $b:expr) => {
86-
$crate::LifetimeData::Placeholder(PlaceholderIndex { ui: UniverseIndex { counter: $b }, idx: 0}).intern(&chalk_ir::interner::ChalkIr)
86+
$crate::LifetimeData::Placeholder(PlaceholderIndex { ui: UniverseIndex { counter: $b }, idx: 0}).intern(&chalk_integration::interner::ChalkIr)
8787
};
8888

8989
(expr $b:expr) => {
@@ -98,6 +98,6 @@ macro_rules! lifetime {
9898
#[macro_export]
9999
macro_rules! ty_name {
100100
((item $n:expr)) => {
101-
$crate::TypeName::Struct(StructId(chalk_ir::interner::RawId { index: $n }))
101+
$crate::TypeName::Struct(StructId(chalk_integration::interner::RawId { index: $n }))
102102
};
103103
}

‎chalk-solve/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
2020
chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine" }
2121
chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir" }
2222
chalk-rust-ir = { version = "0.10.1-dev", path = "../chalk-rust-ir" }
23+
24+
[dev-dependencies]
25+
chalk-integration = { version = "0.10.1-dev", path = "../chalk-integration" }

‎chalk-solve/src/infer/test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use super::unify::UnificationResult;
44
use super::*;
5-
use chalk_ir::interner::ChalkIr;
5+
use chalk_integration::interner::ChalkIr;
66

77
#[test]
88
fn infer() {

‎chalk-solve/src/solve/slg/aggregate.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ impl<I: Interner> AntiUnifier<'_, '_, I> {
439439
/// Test the equivalent of `Vec<i32>` vs `Vec<u32>`
440440
#[test]
441441
fn vec_i32_vs_vec_u32() {
442-
use chalk_ir::interner::ChalkIr;
442+
use chalk_integration::interner::ChalkIr;
443443
let mut infer: InferenceTable<ChalkIr> = InferenceTable::new();
444444
let mut anti_unifier = AntiUnifier {
445445
infer: &mut infer,
@@ -457,7 +457,7 @@ fn vec_i32_vs_vec_u32() {
457457
/// Test the equivalent of `Vec<i32>` vs `Vec<i32>`
458458
#[test]
459459
fn vec_i32_vs_vec_i32() {
460-
use chalk_ir::interner::ChalkIr;
460+
use chalk_integration::interner::ChalkIr;
461461
let interner = &ChalkIr;
462462
let mut infer: InferenceTable<ChalkIr> = InferenceTable::new();
463463
let mut anti_unifier = AntiUnifier {
@@ -476,7 +476,7 @@ fn vec_i32_vs_vec_i32() {
476476
/// Test the equivalent of `Vec<X>` vs `Vec<Y>`
477477
#[test]
478478
fn vec_x_vs_vec_y() {
479-
use chalk_ir::interner::ChalkIr;
479+
use chalk_integration::interner::ChalkIr;
480480
let interner = &ChalkIr;
481481
let mut infer: InferenceTable<ChalkIr> = InferenceTable::new();
482482
let mut anti_unifier = AntiUnifier {

‎chalk-solve/src/solve/truncate.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ mod tests {
7575
use super::*;
7676
#[test]
7777
fn one_type() {
78-
use chalk_ir::interner::ChalkIr;
78+
use chalk_integration::interner::ChalkIr;
7979
let interner = &ChalkIr;
80-
let mut table = InferenceTable::<chalk_ir::interner::ChalkIr>::new();
80+
let mut table = InferenceTable::<chalk_integration::interner::ChalkIr>::new();
8181
let _u1 = table.new_universe();
8282

8383
// Vec<Vec<Vec<Vec<T>>>>
@@ -94,9 +94,9 @@ mod tests {
9494

9595
#[test]
9696
fn multiple_types() {
97-
use chalk_ir::interner::ChalkIr;
97+
use chalk_integration::interner::ChalkIr;
9898
let interner = &ChalkIr;
99-
let mut table = InferenceTable::<chalk_ir::interner::ChalkIr>::new();
99+
let mut table = InferenceTable::<chalk_integration::interner::ChalkIr>::new();
100100
let _u1 = table.new_universe();
101101

102102
// Vec<Vec<Vec<Vec<T>>>>

0 commit comments

Comments
 (0)