nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-03 20:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use as_tuple()

Browse Source
This commit is contained in:
Jonas Schievink 2021-07-01 20:45:47 +02:00
parent b5a2289676
commit e6fdb38d38
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
crates/hir_ty/src/infer/closure.rs
View File

@ -6,7 +6,7 @@ use smallvec::SmallVec;
use crate::{
to_chalk_trait_id, utils, ChalkTraitId, DynTy, FnPointer, FnSig, Interner, Substitution, Ty,
TyKind,
TyExt, TyKind,
};
use super::{Expectation, InferenceContext};
@ -58,30 +58,27 @@ impl InferenceContext<'_> {
// Skip `Self`, get the type argument.
let arg = projection.substitution.as_slice(&Interner).get(1)?;
match arg.ty(&Interner)?.kind(&Interner) {
TyKind::Tuple(_, subst) => {
let generic_args = subst.as_slice(&Interner);
let mut sig_tys = Vec::new();
for arg in generic_args {
sig_tys.push(arg.ty(&Interner)?.clone());
}
sig_tys.push(eq.ty.clone());
cov_mark::hit!(dyn_fn_param_informs_call_site_closure_signature);
return Some(FnPointer {
num_binders: 0,
sig: FnSig {
abi: (),
safety: chalk_ir::Safety::Safe,
variadic: false,
},
substitution: FnSubst(Substitution::from_iter(
&Interner,
sig_tys.clone(),
)),
});
if let Some(subst) = arg.ty(&Interner)?.as_tuple() {
let generic_args = subst.as_slice(&Interner);
let mut sig_tys = Vec::new();
for arg in generic_args {
sig_tys.push(arg.ty(&Interner)?.clone());
}
_ => {}
sig_tys.push(eq.ty.clone());
cov_mark::hit!(dyn_fn_param_informs_call_site_closure_signature);
return Some(FnPointer {
num_binders: 0,
sig: FnSig {
abi: (),
safety: chalk_ir::Safety::Safe,
variadic: false,
},
substitution: FnSubst(Substitution::from_iter(
&Interner,
sig_tys.clone(),
)),
});
}
}
AliasTy::Opaque(_) => {}