Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diagnostics: avoid mismatch between variance index and hir generic #116045

Merged
merged 2 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 19 additions & 3 deletions compiler/rustc_hir_analysis/src/check/wfcheck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1755,20 +1755,36 @@ fn check_variances_for_type_defn<'tcx>(
.collect::<FxHashSet<_>>()
});

let ty_generics = tcx.generics_of(item.owner_id);

for (index, _) in variances.iter().enumerate() {
let parameter = Parameter(index as u32);

if constrained_parameters.contains(&parameter) {
continue;
}

let param = &hir_generics.params[index];
let ty_param = &ty_generics.params[index];
let hir_param = &hir_generics.params[index];

if ty_param.def_id != hir_param.def_id.into() {
// valid programs always have lifetimes before types in the generic parameter list
// ty_generics are normalized to be in this required order, and variances are built
// from ty generics, not from hir generics. but we need hir generics to get
// a span out
//
// if they aren't in the same order, then the user has written invalid code, and already
// got an error about it (or I'm wrong about this)
tcx.sess
.delay_span_bug(hir_param.span, "hir generics and ty generics in different order");
continue;
}

match param.name {
match hir_param.name {
hir::ParamName::Error => {}
_ => {
let has_explicit_bounds = explicitly_bounded_params.contains(&parameter);
report_bivariance(tcx, param, has_explicit_bounds);
report_bivariance(tcx, hir_param, has_explicit_bounds);
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/generics/issue-83556.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
struct Foo<T, 'a>(&'a ());
//~^ ERROR lifetime parameters must be declared prior to

fn main() {}
8 changes: 8 additions & 0 deletions tests/ui/generics/issue-83556.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error: lifetime parameters must be declared prior to type and const parameters
--> $DIR/issue-83556.rs:1:15
|
LL | struct Foo<T, 'a>(&'a ());
| ----^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, T>`

error: aborting due to previous error