Remove hashbrown usage

drain_filter is now supported on nightly

Cargo.lock

@@ -1,11 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "ahash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d66721683190aeea775c737eee925aea24719058d86d815e8ee121dd9f37d19"
-
 [[package]]
 name = "anyhow"
 version = "1.0.32"
@@ -206,15 +200,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.5.0"
@@ -222,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
 dependencies = [
  "autocfg",
- "hashbrown 0.8.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -340,7 +325,6 @@ dependencies = [
  "cranelift-object",
  "cranelift-simplejit",
  "gimli",
- "hashbrown 0.9.0",
  "indexmap",
  "libloading",
  "object",

Cargo.toml

@@ -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/"]

src/lib.rs

@@ -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/optimize/stack2reg.rs

@@ -13,15 +13,12 @@
 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 @@ fn cmp(&self, rhs: &Self) -> std::cmp::Ordering {
 
 #[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 {