FxOrderSet

Author: sharkdp

crates/ty_python_semantic/src/types/builder.rs

@@ -378,27 +378,29 @@ impl<'db> UnionBuilder<'db> {
             }
             Type::EnumLiteral(enum_literal) => {
                 let enum_class = enum_literal.enum_class(self.db);
-
                 let metadata =
                     enum_metadata(self.db, enum_class).expect("Class of enum literal is an enum");
 
-                // TODO: This is a horribly slow implementation just to check if this works.
-                let all_members = metadata.members.iter().collect::<FxHashSet<_>>();
-
-                let mut existing_enum_members = self
+                let members_in_union = self
                     .elements
                     .iter()
                     .filter_map(|element| {
                         if let UnionElement::Type(Type::EnumLiteral(lit)) = element {
-                            Some(lit.name(self.db))
+                            Some(lit.name(self.db).clone())
                         } else {
                             None
                         }
                     })
-                    .collect::<FxHashSet<_>>();
-                existing_enum_members.insert(enum_literal.name(self.db));
+                    .chain(std::iter::once(enum_literal.name(self.db).clone()))
+                    .collect::<FxOrderSet<_>>();
+
+                let all_members_are_in_union = metadata
+                    .members
+                    .difference(&members_in_union)
+                    .next()
+                    .is_none();
 
-                if all_members == existing_enum_members {
+                if all_members_are_in_union {
                     self.add_in_place(enum_literal.enum_class_instance(self.db));
                 } else {
                     if !self.elements.iter().any(|element| match element {

crates/ty_python_semantic/src/types/enums.rs

@@ -3,7 +3,7 @@ use ruff_python_ast::name::Name;
 use rustc_hash::FxHashMap;
 
 use crate::{
-    Db,
+    Db, FxOrderSet,
     place::{Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
     semantic_index::{place_table, use_def_map},
     types::{
@@ -12,16 +12,18 @@ use crate::{
     },
 };
 
-#[derive(Debug, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, PartialEq, Eq)]
 pub(crate) struct EnumMetadata {
-    pub(crate) members: Box<[Name]>,
+    pub(crate) members: FxOrderSet<Name>,
     pub(crate) aliases: FxHashMap<Name, Name>,
 }
 
+impl get_size2::GetSize for EnumMetadata {}
+
 impl EnumMetadata {
     fn empty() -> Self {
         EnumMetadata {
-            members: Box::new([]),
+            members: FxOrderSet::default(),
             aliases: FxHashMap::default(),
         }
     }
@@ -212,7 +214,7 @@ pub(crate) fn enum_metadata<'db>(
             Some(name)
         })
         .cloned()
-        .collect::<Box<_>>();
+        .collect::<FxOrderSet<_>>();
 
     if members.is_empty() {
         // Enum subclasses without members are not considered enums.