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

Move lifetime calculation outside loop

Browse Source
This commit is contained in:
varkor 2018-07-03 16:14:43 +01:00
parent b6eef180cd
commit 84edc0a089
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc_typeck/check/mod.rs
View File

@ -4951,14 +4951,19 @@ pub fn instantiate_value_path(&self,
let supress_mismatch = self.check_impl_trait(span, seg, &generics);
supress_errors.insert(index,
self.check_generic_arg_count(span, seg, &generics, false, supress_mismatch));
infer_lifetimes.insert(index, if let Some(ref data) = seg.args {
let inferred_lifetimes = if if let Some(ref data) = seg.args {
!data.args.iter().any(|arg| match arg {
GenericArg::Lifetime(_) => true,
_ => false,
})
} else {
true
});
} {
generics.own_counts().lifetimes
} else {
0
};
infer_lifetimes.insert(index, inferred_lifetimes);
}
let has_self = path_segs.last().map(|PathSeg(def_id, _)| {
@ -4997,15 +5002,10 @@ pub fn instantiate_value_path(&self,
true
} else {
if let Some(ref data) = segments[index].args {
let lifetime_offset = if infer_lifetimes[&index] {
defs.own_counts().lifetimes
} else {
0
};
let self_offset = (defs.parent_count == 0 && has_self) as usize;
let param_idx =
(param.index as usize - defs.parent_count - self_offset as usize)
.saturating_sub(lifetime_offset);
.saturating_sub(infer_lifetimes[&index]);
if let Some(arg) = data.args.get(param_idx) {
match param.kind {
GenericParamDefKind::Lifetime => match arg {