Fix param_idx calculation

rust-lang · Aug 19, 2018 · d8ba103 · d8ba103
1 parent d5e24dc
commit d8ba103
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -4997,7 +4997,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                         } else {
                             0
                         };
-                        let param_idx = (param.index as usize - has_self as usize)
+                        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);
                         if let Some(arg) = data.args.get(param_idx) {
                             match param.kind {