mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor ty_infer invocation

Browse Source
This commit is contained in:
Sean Bowe 2015-09-13 21:22:30 -06:00
parent 522d4b0a35
commit af3a0b0805
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/librustc_typeck/astconv.rs
View File

@ -412,21 +412,26 @@ fn create_substs_for_ast_path<'tcx>(
// they were optional (e.g. paths inside expressions).
let mut type_substs = if param_mode == PathParamMode::Optional &&
types_provided.is_empty() {
fn default_type_parameter<'tcx>(p: &ty::TypeParameterDef<'tcx>, self_ty: Option<Ty<'tcx>>)
-> Option<ty::TypeParameterDef<'tcx>>
{
if let Some(ref default) = p.default {
if self_ty.is_none() && default.has_self_ty() {
// There is no suitable inference default for a type parameter
// that references self with no self-type provided.
return None;
}
}
Some(p.clone())
}
let mut substs = region_substs.clone();
ty_param_defs
.iter()
.map(|p| {
if let Some(ref default) = p.default {
if self_ty.is_none() && default.has_self_ty() {
// There is no suitable inference default for a type parameter
// that references Self with no self-type provided.
return this.ty_infer(None, Some(&mut substs), Some(TypeSpace), span);
}
}
this.ty_infer(Some(p.clone()), Some(&mut substs), Some(TypeSpace), span)
})
.map(|p| this.ty_infer(default_type_parameter(p, self_ty), Some(&mut substs),
Some(TypeSpace), span))
.collect()
} else {
types_provided