Skip to content

Commit

Permalink
Rollup merge of #109200 - compiler-errors:issue-109191, r=WaffleLapkin
Browse files Browse the repository at this point in the history
Fix index out of bounds in `suggest_trait_fn_ty_for_impl_fn_infer`

Fixes #109191
  • Loading branch information
matthiaskrgr committed Mar 17, 2023
2 parents 0ee7539 + 60da5de commit 55d5cd5
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
9 changes: 6 additions & 3 deletions compiler/rustc_hir_analysis/src/astconv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3328,10 +3328,13 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
tcx,
trait_ref.substs.extend_to(tcx, assoc.def_id, |param, _| tcx.mk_param_from_def(param)),
);
let fn_sig = tcx.liberate_late_bound_regions(fn_hir_id.expect_owner().to_def_id(), fn_sig);

let ty = if let Some(arg_idx) = arg_idx { fn_sig.input(arg_idx) } else { fn_sig.output() };

Some(tcx.liberate_late_bound_regions(fn_hir_id.expect_owner().to_def_id(), ty))
Some(if let Some(arg_idx) = arg_idx {
*fn_sig.inputs().get(arg_idx)?
} else {
fn_sig.output()
})
}

#[instrument(level = "trace", skip(self, generate_err))]
Expand Down
10 changes: 10 additions & 0 deletions tests/ui/suggestions/bad-infer-in-trait-impl.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
trait Foo {
fn bar();
}

impl Foo for () {
fn bar(s: _) {}
//~^ ERROR the placeholder `_` is not allowed within types on item signatures for functions
}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/suggestions/bad-infer-in-trait-impl.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
--> $DIR/bad-infer-in-trait-impl.rs:6:15
|
LL | fn bar(s: _) {}
| ^ not allowed in type signatures
|
help: use type parameters instead
|
LL | fn bar<T>(s: T) {}
| +++ ~

error: aborting due to previous error

For more information about this error, try `rustc --explain E0121`.

0 comments on commit 55d5cd5

Please sign in to comment.