Sorting used item by stable id.

Author: orizi

crates/cairo-lang-semantic/src/items/imp.rs

@@ -23,6 +23,7 @@ use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use cairo_lang_utils::unordered_hash_map::UnorderedHashMap;
 use cairo_lang_utils::{Intern, LookupIntern, define_short_id, extract_matches};
 use itertools::{Itertools, chain, izip};
+use salsa::InternKey;
 use smol_str::SmolStr;
 use syntax::attribute::structured::{Attribute, AttributeListStructurize};
 use syntax::node::ast::{self, GenericArg, ImplItem, MaybeImplBody, OptionReturnTypeClause};
@@ -1064,6 +1065,7 @@ pub fn impl_all_used_items(
             all_used_items.extend(resolver_data.used_items.iter().cloned());
         }
     }
+    all_used_items.sort_by_cached_key(|k| k.stable_location(db).stable_ptr().as_intern_id());
     Ok(all_used_items.into())
 }
 

crates/cairo-lang-semantic/src/items/module.rs

@@ -10,6 +10,7 @@ use cairo_lang_syntax::node::ast;
 use cairo_lang_syntax::node::helpers::UsePathEx;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
+use salsa::InternKey;
 use smol_str::SmolStr;
 
 use super::feature_kind::FeatureKind;
@@ -173,6 +174,7 @@ pub fn module_all_used_items(
             }
         }
     }
+    all_used_items.sort_by_cached_key(|k| k.stable_location(db).stable_ptr().as_intern_id());
     Ok(all_used_items.into())
 }
 

crates/cairo-lang-semantic/src/items/trt.rs

@@ -16,6 +16,7 @@ use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use cairo_lang_utils::unordered_hash_map::UnorderedHashMap;
 use cairo_lang_utils::{Intern, LookupIntern, define_short_id};
+use salsa::InternKey;
 use smol_str::SmolStr;
 
 use super::TraitOrImplContext;
@@ -586,6 +587,7 @@ pub fn trait_all_used_items(
             all_used_items.extend(resolver_data.used_items.iter().cloned());
         }
     }
+    all_used_items.sort_by_cached_key(|k| k.stable_location(db).stable_ptr().as_intern_id());
     Ok(all_used_items.into())
 }
 

crates/cairo-lang-utils/src/ordered_hash_set.rs

@@ -115,6 +115,25 @@ impl<Key: Hash + Eq, BH: BuildHasher> OrderedHashSet<Key, BH> {
     ) -> indexmap::set::Union<'a, Key, BH> {
         self.0.union(&other.0)
     }
+
+    /// Sort the set’s values in place using the comparison function `cmp`.
+    ///
+    /// Computes in **O(n log n)** time and **O(n)** space. The sort is stable.
+    pub fn sort_by(&mut self, cmp: impl FnMut(&Key, &Key) -> std::cmp::Ordering) {
+        self.0.sort_by(cmp);
+    }
+
+    /// Sort the set’s values in place using a key extraction function.
+    ///
+    /// During sorting, the function is called at most once per entry, by using temporary storage
+    /// to remember the results of its evaluation. The order of calls to the function is
+    /// unspecified and may change between versions of `indexmap` or the standard library.
+    ///
+    /// Computes in **O(m n + n log n + c)** time () and **O(n)** space, where the function is
+    /// **O(m)**, *n* is the length of the map, and *c* the capacity. The sort is stable.
+    pub fn sort_by_cached_key<K: Ord>(&mut self, sort_key: impl FnMut(&Key) -> K) {
+        self.0.sort_by_cached_key(sort_key);
+    }
 }
 
 impl<Key, BH> IntoIterator for OrderedHashSet<Key, BH> {