Skip to content

Commit

Permalink
Do not reinsert generics for enums
Browse files Browse the repository at this point in the history
  • Loading branch information
nilehmann committed Nov 14, 2023
1 parent 684d66c commit c5f4284
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions crates/flux-desugar/src/desugar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ fn gather_base_sort_vars(
}
}
}

fn gather_sort_vars(
generics: &FxHashSet<Symbol>,
sort: &surface::Sort,
Expand Down
7 changes: 2 additions & 5 deletions crates/flux-desugar/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
Expand Down

0 comments on commit c5f4284

Please sign in to comment.