Rollup merge of #47258 - rkruppe:struct-assert, r=eddyb

rustc::ty: Rename struct_variant to non_enum_variant

r? @eddyb

diff --cc src/librustc/middle/dead.rs
Simple merge

diff --cc src/librustc/ty/mod.rs
Simple merge

diff --cc src/librustc_metadata/encoder.rs
Simple merge

diff --cc src/librustc_typeck/check/method/suggest.rs
Simple merge