language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Some more TyBuilder use

Browse source
This commit is contained in:
Florian Diebold 2021-04-03 22:28:10 +02:00
parent 5d2b488aeb
commit eaa03ef446
2 changed files with 25 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/hir_ty/src/infer/expr.rs
View file

@ -19,11 +19,11 @@ use crate::{
lower::lower_to_chalk_mutability, lower::lower_to_chalk_mutability,
method_resolution, op, method_resolution, op,
primitive::{self, UintTy}, primitive::{self, UintTy},
to_assoc_type_id, to_chalk_trait_id, to_chalk_trait_id,
traits::{chalk::from_chalk, FnTrait, InEnvironment}, traits::{chalk::from_chalk, FnTrait, InEnvironment},
utils::{generics, variant_data, Generics}, utils::{generics, variant_data, Generics},
AdtId, Binders, CallableDefId, DomainGoal, FnPointer, FnSig, Interner, Rawness, Scalar, AdtId, Binders, CallableDefId, FnPointer, FnSig, Interner, Rawness, Scalar, Substitution,
Substitution, TraitRef, Ty, TyBuilder, TyKind, TraitRef, Ty, TyBuilder, TyKind,
}; };
use super::{ use super::{
@ -73,38 +73,34 @@ impl<'a> InferenceContext<'a> {
let fn_once_trait = FnTrait::FnOnce.get_id(self.db, krate)?; let fn_once_trait = FnTrait::FnOnce.get_id(self.db, krate)?;
let output_assoc_type = let output_assoc_type =
self.db.trait_data(fn_once_trait).associated_type_by_name(&name![Output])?; self.db.trait_data(fn_once_trait).associated_type_by_name(&name![Output])?;
let generic_params = generics(self.db.upcast(), fn_once_trait.into());
if generic_params.len() != 2 { let mut arg_tys = vec![];
let parameters = Substitution::builder(num_args)
.fill(repeat_with(|| {
let arg = self.table.new_type_var();
arg_tys.push(arg.clone());
arg
}))
.build();
let arg_ty = TyKind::Tuple(num_args, parameters).intern(&Interner);
let projection = {
let b = TyBuilder::assoc_type_projection(self.db, output_assoc_type);
if b.remaining() != 2 {
return None; return None;
} }
b.push(ty.clone()).push(arg_ty).build()
let mut param_builder = Substitution::builder(num_args); };
let mut arg_tys = vec![];
for _ in 0..num_args {
let arg = self.table.new_type_var();
param_builder = param_builder.push(arg.clone());
arg_tys.push(arg);
}
let parameters = param_builder.build();
let arg_ty = TyKind::Tuple(num_args, parameters).intern(&Interner);
let substs =
Substitution::build_for_generics(&generic_params).push(ty.clone()).push(arg_ty).build();
let trait_env = self.trait_env.env.clone(); let trait_env = self.trait_env.env.clone();
let implements_fn_trait: DomainGoal = let obligation = InEnvironment {
TraitRef { trait_id: to_chalk_trait_id(fn_once_trait), substitution: substs.clone() } goal: projection.trait_ref(self.db).cast(&Interner),
.cast(&Interner);
let goal = self.canonicalizer().canonicalize_obligation(InEnvironment {
goal: implements_fn_trait.clone(),
environment: trait_env, environment: trait_env,
});
if self.db.trait_solve(krate, goal.value).is_some() {
self.push_obligation(implements_fn_trait);
let output_proj_ty = crate::ProjectionTy {
associated_ty_id: to_assoc_type_id(output_assoc_type),
substitution: substs,
}; };
let return_ty = self.normalize_projection_ty(output_proj_ty); let canonical = self.canonicalizer().canonicalize_obligation(obligation.clone());
if self.db.trait_solve(krate, canonical.value).is_some() {
self.push_obligation(obligation.goal);
let return_ty = self.normalize_projection_ty(projection);
Some((arg_tys, return_ty)) Some((arg_tys, return_ty))
} else { } else {
None None

4
crates/hir_ty/src/lib.rs
View file

@ -493,10 +493,6 @@ impl Substitution {
) )
} }
pub(crate) fn build_for_generics(generic_params: &Generics) -> SubstsBuilder {
Substitution::builder(generic_params.len())
}
fn builder(param_count: usize) -> SubstsBuilder { fn builder(param_count: usize) -> SubstsBuilder {
SubstsBuilder { vec: Vec::with_capacity(param_count), param_count } SubstsBuilder { vec: Vec::with_capacity(param_count), param_count }
} }