Remove hashbrown usage

drain_filter is now supported on nightly

Author: bjorn3

Cargo.lock

@@ -23,7 +23,6 @@ byteorder = "1.2.7"
 indexmap = "1.0.2"
 cfg-if = "0.1.10"
 libloading = { version = "0.6.0", optional = true }
-hashbrown = "0.9.0"
 
 # Uncomment to use local checkout of cranelift
 #[patch."https://github.com/bytecodealliance/wasmtime/"]

Cargo.toml

@@ -4,7 +4,8 @@
     type_alias_impl_trait,
     associated_type_bounds,
     never_type,
-    try_blocks
+    try_blocks,
+    hash_drain_filter,
 )]
 #![warn(rust_2018_idioms)]
 #![warn(unused_lifetimes)]

src/lib.rs

@@ -13,15 +13,12 @@ use std::collections::BTreeMap;
 use std::fmt;
 use std::ops::Not;
 
-use rustc_data_structures::fx::{FxHashSet, FxHasher};
+use rustc_data_structures::fx::FxHashSet;
 
 use cranelift_codegen::cursor::{Cursor, FuncCursor};
 use cranelift_codegen::ir::immediates::Offset32;
 use cranelift_codegen::ir::{InstructionData, Opcode, ValueDef};
 
-use hashbrown::HashSet;
-use std::hash::BuildHasherDefault;
-
 use crate::prelude::*;
 
 /// Workaround for `StackSlot` not implementing `Ord`.
@@ -48,9 +45,9 @@ impl Ord for OrdStackSlot {
 
 #[derive(Debug, Default)]
 struct StackSlotUsage {
-    stack_addr: HashSet<Inst, BuildHasherDefault<FxHasher>>,
-    stack_load: HashSet<Inst, BuildHasherDefault<FxHasher>>,
-    stack_store: HashSet<Inst, BuildHasherDefault<FxHasher>>,
+    stack_addr: FxHashSet<Inst>,
+    stack_load: FxHashSet<Inst>,
+    stack_store: FxHashSet<Inst>,
 }
 
 impl StackSlotUsage {