switch to hashbrown::HashSet - working with explicit type parameter i…

…n hashbrown::HashSet::contains call

naga/src/back/spv/writer.rs

@@ -167,7 +167,10 @@ impl Writer {
                 let selected = match self.capabilities_available {
                     None => first,
                     Some(ref available) => {
-                        match capabilities.iter().find(|cap| available.contains(cap)) {
+                        match capabilities
+                            .iter()
+                            .find(|cap| available.contains::<spirv::Capability>(cap))
+                        {
                             Some(&cap) => cap,
                             None => {
                                 return Err(Error::MissingCapabilities(what, capabilities.to_vec()))

naga/src/lib.rs

@@ -287,9 +287,10 @@ pub const ABSTRACT_WIDTH: Bytes = 8;
 /// To construct a new instance: `FastHashMap::default()`
 pub type FastHashMap<K, T> =
     hashbrown::HashMap<K, T, std::hash::BuildHasherDefault<rustc_hash::FxHasher>>;
-// XXX XXX STILL USING HashSet from std::collections - USING hashbrown::HashSet for FastHashSet BREAKS spirv - XXX XXX NEEDS INVESTIGATION
 /// Hash set that is faster but not resilient to DoS attacks.
-pub type FastHashSet<K> = rustc_hash::FxHashSet<K>;
+/// (Similar to rustc_hash::FxHashSet but using hashbrown::HashSet instead of std::collections::HashMap.)
+pub type FastHashSet<K> =
+    hashbrown::HashSet<K, std::hash::BuildHasherDefault<rustc_hash::FxHasher>>;
 
 /// Insertion-order-preserving hash set (`IndexSet<K>`), but with the same
 /// hasher as `FastHashSet<K>` (faster but not resilient to DoS attacks).