Skip to content

Commit 02f7b5d

Browse files
Merge #4761
4761: Upgrade Chalk to published version r=matklad a=flodiebold CC @pksunkara Co-authored-by: Florian Diebold <florian.diebold@freiheit.com>
2 parents 2a3ab7f + 69854f7 commit 02f7b5d

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

Cargo.lock

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

crates/ra_hir_ty/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ test_utils = { path = "../test_utils" }
2727

2828
scoped-tls = "1"
2929

30-
chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" }
31-
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" }
30+
chalk-solve = "0.11"
31+
chalk-ir = "0.11"
3232

3333
[dev-dependencies]
3434
insta = "0.16.0"

crates/ra_hir_ty/src/traits/chalk/mapping.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,11 @@ impl ToChalk for GenericPredicate {
482482
let ty = from_chalk(db, projection_eq.ty);
483483
GenericPredicate::Projection(ProjectionPredicate { projection_ty, ty })
484484
}
485+
486+
chalk_ir::WhereClause::LifetimeOutlives(_) => {
487+
// we shouldn't get these from Chalk
488+
panic!("encountered LifetimeOutlives from Chalk")
489+
}
485490
}
486491
}
487492
}

0 commit comments

Comments
 (0)