Skip to content

Commit

Permalink
Convert a span_bug to a span_delayed_bug.
Browse files Browse the repository at this point in the history
PR rust-lang#121208 converted this from a `span_delayed_bug` to a `span_bug`
because nothing in the test suite caused execution to hit this path. But
now fuzzing has found a test case that does hit it. So this commit
converts it back to `span_delayed_bug` and adds the relevant test.

Fixes rust-lang#126385.
  • Loading branch information
nnethercote committed Jun 17, 2024
1 parent 55cac26 commit daac3ef
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 3 deletions.
4 changes: 1 addition & 3 deletions compiler/rustc_borrowck/src/diagnostics/region_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
| GenericArgKind::Const(_),
_,
) => {
// This was previously a `span_delayed_bug` and could be
// reached by the test for #82126, but no longer.
self.dcx().span_bug(
self.dcx().span_delayed_bug(
hir_arg.span(),
format!("unmatched arg and hir arg: found {kind:?} vs {hir_arg:?}"),
);
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/borrowck/issue-126385-unmatched-arg-and-hir-arg.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pub struct MyStruct<'field> {
field: &'field [u32],
}

impl MyStruct<'_> {
pub fn f(field: &[u32]) -> Self<u32> { //~ ERROR type arguments are not allowed on self type
Self { field } //~ ERROR lifetime may not live long enough
}
}

fn main() {}
34 changes: 34 additions & 0 deletions tests/ui/borrowck/issue-126385-unmatched-arg-and-hir-arg.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
error[E0109]: type arguments are not allowed on self type
--> $DIR/issue-126385-unmatched-arg-and-hir-arg.rs:6:37
|
LL | pub fn f(field: &[u32]) -> Self<u32> {
| ---- ^^^ type argument not allowed
| |
| not allowed on self type
|
note: `Self` is of type `MyStruct<'_>`
--> $DIR/issue-126385-unmatched-arg-and-hir-arg.rs:1:12
|
LL | pub struct MyStruct<'field> {
| ^^^^^^^^ `Self` corresponds to this type
...
LL | impl MyStruct<'_> {
| ----------------- `Self` is on type `MyStruct` in this `impl`
help: the `Self` type doesn't accept type parameters, use the concrete type's name `MyStruct` instead if you want to specify its type parameters
|
LL | pub fn f(field: &[u32]) -> MyStruct<u32> {
| ~~~~~~~~

error: lifetime may not live long enough
--> $DIR/issue-126385-unmatched-arg-and-hir-arg.rs:7:9
|
LL | pub fn f(field: &[u32]) -> Self<u32> {
| - --------- return type is MyStruct<'2>
| |
| let's call the lifetime of this reference `'1`
LL | Self { field }
| ^^^^^^^^^^^^^^ associated function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`

error: aborting due to 2 previous errors

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

0 comments on commit daac3ef

Please sign in to comment.