diff options
| author | bors <bors@rust-lang.org> | 2022-10-26 14:12:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-26 14:12:16 +0000 |
| commit | 0a6b941df354c59b546ec4c0d27f2b9b0cb1162c (patch) | |
| tree | 54d7e69a23086191d8c755260e36da8e60c8c295 /compiler/rustc_hir_analysis/src | |
| parent | 43dd3d514b6b11c5195de2fd8e665828801d0972 (diff) | |
| parent | 74a4c679b37ee687cba88534c1e2b22da55f55be (diff) | |
| download | rust-0a6b941df354c59b546ec4c0d27f2b9b0cb1162c.tar.gz rust-0a6b941df354c59b546ec4c0d27f2b9b0cb1162c.zip | |
Auto merge of #103572 - Dylan-DPC:rollup-a8bnxrw, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #95710 (Stabilize arbitrary_enum_discriminant, take 2) - #102706 (Support excluding the generation of the standalone docs) - #103428 (Removed verbose printing from the `PrettyPrinter` when printing constants) - #103543 (Update books) - #103546 (interpret: a bit of cast cleanup) - #103554 (rustdoc: add visible focus outline to rustdoc-toggle) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/check.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/check.rs b/compiler/rustc_hir_analysis/src/check/check.rs index a1faf802519..b302cee4816 100644 --- a/compiler/rustc_hir_analysis/src/check/check.rs +++ b/compiler/rustc_hir_analysis/src/check/check.rs @@ -1180,7 +1180,7 @@ fn check_enum<'tcx>(tcx: TyCtxt<'tcx>, vs: &'tcx [hir::Variant<'tcx>], def_id: L } } - if tcx.adt_def(def_id).repr().int.is_none() && tcx.features().arbitrary_enum_discriminant { + if tcx.adt_def(def_id).repr().int.is_none() { let is_unit = |var: &hir::Variant<'_>| matches!(var.data, hir::VariantData::Unit(..)); let has_disr = |var: &hir::Variant<'_>| var.disr_expr.is_some(); |