Merge #1843

1843: Upgrade Chalk r=flodiebold a=flodiebold

... and remove Ty::UnselectedProjection. It'll be handled differently.

Co-authored-by: Florian Diebold <[email protected]>

2 files changed, 0 insertions, 13 deletions

diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 3ee083a04..bf57bb3b7 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -429,10 +429,6 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         let ty = self.resolve_ty_as_possible(&mut vec![], ty);
         ty.fold(&mut |ty| match ty {
             Ty::Projection(proj_ty) => self.normalize_projection_ty(proj_ty),
-            Ty::UnselectedProjection(proj_ty) => {
-                // FIXME use Chalk's unselected projection support
-                Ty::UnselectedProjection(proj_ty)
-            }
             _ => ty,
         })
     }
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs
index 0367c6560..c748e9d84 100644
--- a/crates/ra_hir/src/ty/traits/chalk.rs
+++ b/crates/ra_hir/src/ty/traits/chalk.rs
@@ -65,14 +65,6 @@ impl ToChalk for Ty {
                 let parameters = proj_ty.parameters.to_chalk(db);
                 chalk_ir::ProjectionTy { associated_ty_id, parameters }.cast()
             }
-            Ty::UnselectedProjection(proj_ty) => {
-                let type_name = lalrpop_intern::intern(&proj_ty.type_name.to_string());
-                let parameters = proj_ty.parameters.to_chalk(db);
-                chalk_ir::Ty::UnselectedProjection(chalk_ir::UnselectedProjectionTy {
-                    type_name,
-                    parameters,
-                })
-            }
             Ty::Param { idx, .. } => {
                 PlaceholderIndex { ui: UniverseIndex::ROOT, idx: idx as usize }.to_ty()
             }
@@ -113,7 +105,6 @@ impl ToChalk for Ty {
                 }
             }
             chalk_ir::Ty::Projection(_) => unimplemented!(),
-            chalk_ir::Ty::UnselectedProjection(_) => unimplemented!(),
             chalk_ir::Ty::ForAll(_) => unimplemented!(),
             chalk_ir::Ty::BoundVar(idx) => Ty::Bound(idx as u32),
             chalk_ir::Ty::InferenceVar(_iv) => panic!("unexpected chalk infer ty"),