OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix confirm.rs

Browse Source
This commit is contained in:
varkor 2018-07-03 19:55:28 +01:00
parent 340a7fc4f5
commit e02642dbb3
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/librustc_typeck/check/method/confirm.rs
View File

@ -323,12 +323,26 @@ impl<'a, 'gcx, 'tcx> ConfirmContext<'a, 'gcx, 'tcx> {
// parameters from the type and those from the method.
assert_eq!(method_generics.parent_count, parent_substs.len());
Substs::for_item(self.tcx, pick.item.def_id, |param, _| {
let i = param.index as usize;
if i < parent_substs.len() {
parent_substs[i]
let inferred_lifetimes = if if let Some(ref data) = segment.args {
!data.args.iter().any(|arg| match arg {
GenericArg::Lifetime(_) => true,
_ => false,
})
} else {
let param_idx = i - parent_substs.len();
true
} {
method_generics.own_counts().lifetimes
} else {
0
};
Substs::for_item(self.tcx, pick.item.def_id, |param, _| {
let param_idx = param.index as usize;
if param_idx < parent_substs.len() {
parent_substs[param_idx]
} else {
let param_idx = (param.index as usize - parent_substs.len())
.saturating_sub(inferred_lifetimes);
if let Some(ref data) = segment.args {
if let Some(arg) = data.args.get(param_idx) {