From c5f428428603acaafcf86a9fff5f93429757fa8c Mon Sep 17 00:00:00 2001 From: Nico Lehmann Date: Tue, 14 Nov 2023 10:20:24 -0800 Subject: [PATCH] Do not reinsert generics for enums --- crates/flux-desugar/src/desugar.rs | 1 + crates/flux-desugar/src/lib.rs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/flux-desugar/src/desugar.rs b/crates/flux-desugar/src/desugar.rs index 68c3e7b6f1..7fab51e6da 100644 --- a/crates/flux-desugar/src/desugar.rs +++ b/crates/flux-desugar/src/desugar.rs @@ -113,6 +113,7 @@ fn gather_base_sort_vars( } } } + fn gather_sort_vars( generics: &FxHashSet, sort: &surface::Sort, diff --git a/crates/flux-desugar/src/lib.rs b/crates/flux-desugar/src/lib.rs index 46fdfe6da3..1a603bb321 100644 --- a/crates/flux-desugar/src/lib.rs +++ b/crates/flux-desugar/src/lib.rs @@ -54,7 +54,6 @@ pub fn desugar_struct_def( let mut cx = DesugarCtxt::new(genv, owner_id, resolver_output, None); - // Desugar and insert generics let predicates = cx.as_lift_cx().lift_predicates()?; // Desugar of struct_def needs to happen AFTER inserting generics. See #generics-and-desugaring @@ -78,11 +77,9 @@ pub fn desugar_enum_def( let mut cx = DesugarCtxt::new(genv, owner_id, resolver_output, None); - // Desugar and inserting generics - let (generics, predicates) = cx.as_lift_cx().lift_generics_with_predicates()?; - genv.map().insert_generics(def_id, generics); + let predicates = cx.as_lift_cx().lift_predicates()?; - // Desugar of enum def needs to happen AFTER inserting generics. See crate level comment + // Desugar of enum_def needs to happen AFTER inserting generics. See #generics-and-desugaring let enum_def = cx.desugar_enum_def(enum_def)?; if config::dump_fhir() { dbg::dump_item_info(genv.tcx, owner_id, "fhir", &enum_def).unwrap();