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

Fix behaviour in error condition

Browse Source
This commit is contained in:
varkor 2018-07-23 23:55:24 +01:00
parent db94efab39
commit 5f2588f020
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4987,24 +4987,21 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} }
}; };
while let Some((def_id, defs)) = stack.pop() { while let Some((def_id, defs)) = stack.pop() {
let mut params = defs.params.iter().peekable(); let mut params = defs.params.iter();
let mut remove_self = false; let mut next_param = params.next();
if has_self { if has_self {
if let Some(param) = params.peek() { if let Some(param) = next_param {
if param.index == 0 { if param.index == 0 {
if let GenericParamDefKind::Type { .. } = param.kind { if let GenericParamDefKind::Type { .. } = param.kind {
// Handle `Self` first, so we can adjust the index to match the AST. // Handle `Self` first, so we can adjust the index to match the AST.
push_to_substs!(opt_self_ty.map(|ty| ty.into()).unwrap_or_else(|| { push_to_substs!(opt_self_ty.map(|ty| ty.into()).unwrap_or_else(|| {
self.var_for_def(span, param) self.var_for_def(span, param)
})); }));
remove_self = true; next_param = params.next();
} }
} }
} }
} }
if remove_self {
params.next();
}
let mut infer_types = true; let mut infer_types = true;
if let Some(&PathSeg(_, index)) = path_segs if let Some(&PathSeg(_, index)) = path_segs
@ -5015,29 +5012,33 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
if let Some(ref data) = segments[index].args { if let Some(ref data) = segments[index].args {
let args = &data.args; let args = &data.args;
'args: for arg in args { 'args: for arg in args {
while let Some(param) = params.next() { while let Some(param) = next_param {
match param.kind { match param.kind {
GenericParamDefKind::Lifetime => match arg { GenericParamDefKind::Lifetime => match arg {
GenericArg::Lifetime(lt) => { GenericArg::Lifetime(lt) => {
push_to_substs!(AstConv::ast_region_to_region(self, push_to_substs!(AstConv::ast_region_to_region(self,
lt, Some(param)).into()); lt, Some(param)).into());
next_param = params.next();
continue 'args; continue 'args;
} }
GenericArg::Type(_) => { GenericArg::Type(_) => {
// We're inferring a lifetime. // We're inferring a lifetime.
push_to_substs!( push_to_substs!(
self.re_infer(span, Some(param)).unwrap().into()); self.re_infer(span, Some(param)).unwrap().into());
next_param = params.next();
} }
} }
GenericParamDefKind::Type { .. } => match arg { GenericParamDefKind::Type { .. } => match arg {
GenericArg::Type(ty) => { GenericArg::Type(ty) => {
push_to_substs!(self.to_ty(ty).into()); push_to_substs!(self.to_ty(ty).into());
next_param = params.next();
continue 'args; continue 'args;
} }
GenericArg::Lifetime(_) => { GenericArg::Lifetime(_) => {
self.tcx.sess.delay_span_bug(span, self.tcx.sess.delay_span_bug(span,
"found a GenericArg::Lifetime where a \ "found a GenericArg::Lifetime where a \
GenericArg::Type was expected"); GenericArg::Type was expected");
break 'args;
} }
} }
} }
@ -5051,7 +5052,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} }
} }
while let Some(param) = params.next() { while let Some(param) = next_param {
match param.kind { match param.kind {
GenericParamDefKind::Lifetime => { GenericParamDefKind::Lifetime => {
push_to_substs!(self.re_infer(span, Some(param)).unwrap().into()); push_to_substs!(self.re_infer(span, Some(param)).unwrap().into());
@ -5073,6 +5074,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} }
} }
} }
next_param = params.next();
} }
} }
let substs = self.tcx.intern_substs(&substs); let substs = self.tcx.intern_substs(&substs);