language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update Chalk

Browse source
This commit is contained in:
Florian Diebold 2019-05-01 23:26:42 +02:00
parent 0f34568924
commit 0bcf47b22b
4 changed files with 39 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_hir/src/ty/method_resolution.rs
View file

@ -202,7 +202,6 @@ fn iterate_trait_method_candidates<T>(
}
}
known_implemented = true;
// TODO the self type is now canonicalized...
if let Some(result) = callback(&ty.value, m) {
return Some(result);
}

17
crates/ra_hir/src/ty/traits/chalk.rs
View file

@ -40,9 +40,7 @@ impl ToChalk for Ty {
Ty::Infer(_infer_ty) => panic!("uncanonicalized infer ty"),
// FIXME this is clearly incorrect, but probably not too incorrect
// and I'm not sure what to actually do with Ty::Unknown
Ty::Unknown => {
PlaceholderIndex { ui: UniverseIndex::ROOT, idx: 0 }.to_ty()
},
Ty::Unknown => PlaceholderIndex { ui: UniverseIndex::ROOT, idx: 0 }.to_ty(),
}
}
fn from_chalk(db: &impl HirDatabase, chalk: chalk_ir::Ty) -> Self {
@ -189,7 +187,9 @@ where
fundamental: false,
};
let where_clauses = Vec::new(); // FIXME add where clauses
let trait_datum_bound = chalk_rust_ir::TraitDatumBound { trait_ref, where_clauses, flags };
let associated_ty_ids = Vec::new(); // FIXME add associated tys
let trait_datum_bound =
chalk_rust_ir::TraitDatumBound { trait_ref, where_clauses, flags, associated_ty_ids };
let trait_datum = TraitDatum { binders: make_binders(trait_datum_bound, bound_vars.len()) };
Arc::new(trait_datum)
}
@ -289,6 +289,15 @@ where
debug!("split_projection {:?}", projection);
unimplemented!()
}
fn custom_clauses(&self) -> Vec<chalk_ir::ProgramClause> {
debug!("custom_clauses");
vec![]
}
fn all_structs(&self) -> Vec<chalk_ir::StructId> {
debug!("all_structs");
// FIXME
vec![]
}
}
fn id_from_chalk<T: InternKey>(chalk_id: chalk_ir::RawId) -> T {