switch to hashbrown for RawEntryMut api

Author: RobertObkircher

Cargo.toml

@@ -5,4 +5,8 @@ authors = ["Robert Obkircher <robert.obkircher@gmail.com>"]
 edition = "2021"
 
 [features]
-fuzzing = []
+fuzzing = []
+
+[dependencies]
+# nightly is required for may_dangle on drop
+hashbrown = { version = "0.17", features = ["nightly"] }

src/lib.rs

@@ -1,5 +1,2 @@
-#![feature(hash_raw_entry)]
-#![feature(hash_set_entry)]
-
 pub mod datastructures;
 pub mod sea_of_nodes;

src/sea_of_nodes/graph_visualizer.rs

@@ -3,7 +3,7 @@ use crate::sea_of_nodes::nodes::node::{Scope, Stop};
 use crate::sea_of_nodes::nodes::{Node, Nodes, Op};
 use crate::sea_of_nodes::types::Ty;
 use fmt::Write;
-use std::collections::HashSet;
+use hashbrown::HashSet;
 use std::fmt;
 use std::process::{Command, Stdio};
 use std::sync::Mutex;

src/sea_of_nodes/ir_printer.rs

@@ -1,8 +1,8 @@
 use crate::datastructures::id_set::IdSet;
 use crate::sea_of_nodes::nodes::{Cfg, Node, Nodes};
 use crate::sea_of_nodes::types::{Ty, Types};
+use hashbrown::HashMap;
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::fmt;
 use std::fmt::Write;
 
@@ -370,7 +370,7 @@ fn pretty_print_scheduled(
             }
         }
         let blk = blk.unwrap();
-        ds.remove(&blk);
+        ds.remove(&*blk);
         if let Some(p) = ns.iter().position(|n| *n == *blk) {
             ns.remove(p);
         }

src/sea_of_nodes/nodes.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use hashbrown::HashMap;
 use std::num::NonZeroU32;
 
 use crate::datastructures::id_set::IdSet;

src/sea_of_nodes/nodes/gvn.rs

@@ -1,6 +1,6 @@
 use crate::datastructures::id_vec::IdVec;
 use crate::sea_of_nodes::nodes::{Node, Nodes, Op, OpVec};
-use std::collections::hash_map::RawEntryMut;
+use hashbrown::hash_map::RawEntryMut;
 use std::hash::{BuildHasher, DefaultHasher, Hash, Hasher};
 use std::num::NonZeroU32;
 

src/sea_of_nodes/nodes/node.rs

@@ -1,5 +1,5 @@
+use hashbrown::{Equivalent, HashMap};
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::fmt;
 use std::fmt::{Debug, Display};
 use std::num::NonZeroU32;
@@ -129,6 +129,11 @@ macro_rules! define_id {
                 Self::$Id(value)
             }
         }
+        impl Equivalent<Node> for $Id {
+            fn equivalent(&self, key: &Node) -> bool {
+                self.to_node() == *key
+            }
+        }
         impl fmt::Display for $Id {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 Display::fmt(&self.0, f)
@@ -328,7 +333,7 @@ define_ids!(<'t>
 
 impl<'t> Op<'t> {
     /// Easy reading label for debugger
-    pub fn label(&self) -> Cow<str> {
+    pub fn label(&self) -> Cow<'t, str> {
         fn mlabel(name: &str) -> &str {
             match name {
                 "[]" => "ary",
@@ -389,7 +394,7 @@ impl<'t> Op<'t> {
     }
 
     // Graphical label, e.g. "+" or "Region" or "=="
-    pub fn glabel(&self) -> Cow<str> {
+    pub fn glabel(&self) -> Cow<'t, str> {
         match self {
             Op::Add | Op::AddF => Borrowed("+"),
             Op::Sub | Op::SubF => Borrowed("-"),

src/sea_of_nodes/parser.rs

@@ -5,7 +5,7 @@ use crate::sea_of_nodes::nodes::node::{
 };
 use crate::sea_of_nodes::nodes::{BoolOp, Node, Nodes, Op, Phi};
 use crate::sea_of_nodes::types::{Field, Ty, TyMemPtr, TyStruct, Types};
-use std::collections::HashMap;
+use hashbrown::HashMap;
 
 /// Converts a Simple source program to the Sea of Nodes intermediate representation in one pass.
 pub struct Parser<'s, 't> {

src/sea_of_nodes/tests/evaluator.rs

@@ -7,7 +7,7 @@ use crate::sea_of_nodes::nodes::{BoolOp, Node, Nodes};
 use crate::sea_of_nodes::tests::scheduler;
 use crate::sea_of_nodes::tests::scheduler::{Block, BlockId};
 use crate::sea_of_nodes::types::{TyStruct, Type};
-use std::collections::HashMap;
+use hashbrown::HashMap;
 use std::fmt;
 use std::fmt::{Display, Formatter};
 use std::ops::{Add, BitAnd, BitOr, BitXor, Mul, Neg, Sub};

src/sea_of_nodes/tests/scheduler.rs

@@ -23,7 +23,7 @@
 
 use crate::sea_of_nodes::nodes::node::{Phi, Start, TypedNode};
 use crate::sea_of_nodes::nodes::{Node, Nodes, Op};
-use std::collections::HashMap;
+use hashbrown::HashMap;
 
 /// A basic block with a schedule of the containing nodes.
 pub struct Block {
@@ -599,7 +599,7 @@ impl Scheduler {
                 None => {}
                 Some(n) if n.is_if(sea) => {
                     for p in sea.outputs[n].iter().filter_map(|n| n.to_cproj(sea)) {
-                        block.next[sea[p].index] = blocks[&*p];
+                        block.next[sea[p].index] = blocks[&p];
                     }
                 }
                 Some(n) if n.is_region(sea) => {