Use ahash in the compiler

coolreader18 · coolreader18 · commit 688880c540c9 · 2021-01-08T17:00:23.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -16,6 +16,7 @@ num-complex = { version = "0.3", features = ["serde"] }
 num-traits = "0.2"
 log = "0.4"
 arrayvec = "0.5"
+ahash = "0.6"
 
 [dev-dependencies]
 rustpython-parser = { path = "../parser" }
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -9,7 +9,7 @@ use crate::error::{CompileError, CompileErrorType};
 use crate::ir::{self, CodeInfo};
 pub use crate::mode::Mode;
 use crate::symboltable::{make_symbol_table, statements_to_symbol_table, SymbolScope, SymbolTable};
-use indexmap::IndexSet;
+use crate::IndexSet;
 use itertools::Itertools;
 use num_complex::Complex64;
 use num_traits::ToPrimitive;
@@ -140,10 +140,10 @@ impl Compiler {
             blocks: vec![ir::Block::default()],
             current_block: bytecode::Label(0),
             constants: Vec::new(),
-            name_cache: IndexSet::new(),
-            varname_cache: IndexSet::new(),
-            cellvar_cache: IndexSet::new(),
-            freevar_cache: IndexSet::new(),
+            name_cache: IndexSet::default(),
+            varname_cache: IndexSet::default(),
+            cellvar_cache: IndexSet::default(),
+            freevar_cache: IndexSet::default(),
         };
         Compiler {
             code_stack: vec![module_code],
@@ -217,8 +217,8 @@ impl Compiler {
             blocks: vec![ir::Block::default()],
             current_block: bytecode::Label(0),
             constants: Vec::new(),
-            name_cache: IndexSet::new(),
-            varname_cache: IndexSet::new(),
+            name_cache: IndexSet::default(),
+            varname_cache: IndexSet::default(),
             cellvar_cache,
             freevar_cache,
         };
diff --git a/compiler/src/ir.rs b/compiler/src/ir.rs
@@ -1,4 +1,4 @@
-use indexmap::IndexSet;
+use crate::IndexSet;
 use rustpython_bytecode::{CodeFlags, CodeObject, ConstantData, Instruction, Label, Location};
 
 pub type BlockIdx = Label;
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -5,6 +5,9 @@
 #[macro_use]
 extern crate log;
 
+type IndexMap<K, V> = indexmap::IndexMap<K, V, ahash::RandomState>;
+type IndexSet<T> = indexmap::IndexSet<T, ahash::RandomState>;
+
 pub mod compile;
 pub mod error;
 pub mod ir;
diff --git a/compiler/src/symboltable.rs b/compiler/src/symboltable.rs
@@ -8,7 +8,7 @@ Inspirational file: https://github.com/python/cpython/blob/master/Python/symtabl
 */
 
 use crate::error::{CompileError, CompileErrorType};
-use indexmap::map::IndexMap;
+use crate::IndexMap;
 use rustpython_ast::{self as ast, Location};
 use std::fmt;
 
@@ -58,7 +58,7 @@ impl SymbolTable {
             typ,
             line_number,
             is_nested,
-            symbols: IndexMap::new(),
+            symbols: IndexMap::default(),
             sub_tables: vec![],
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use indexmap::IndexSet;`
	`1`	`+use crate::IndexSet;`
`2`	`2`	`use rustpython_bytecode::{CodeFlags, CodeObject, ConstantData, Instruction, Label, Location};`
`3`	`3`
`4`	`4`	`pub type BlockIdx = Label;`