Merge upstream/master into master

Cargo.lock

@@ -646,7 +646,6 @@ dependencies = [
 name = "nac3artiq"
 version = "0.1.0"
 dependencies = [
- "indexmap 2.7.1",
  "itertools",
  "nac3core",
  "nac3ld",

nac3artiq/Cargo.toml

@@ -9,7 +9,6 @@ name = "nac3artiq"
 crate-type = ["cdylib"]
 
 [dependencies]
-indexmap = "2.7"
 itertools = "0.14"
 pyo3 = { version = "0.21", features = ["extension-module", "gil-refs"] }
 parking_lot = "0.12"

nac3artiq/src/lib.rs

@@ -19,7 +19,6 @@ use std::{
     sync::Arc,
 };
 
-use indexmap::IndexMap;
 use itertools::Itertools;
 use parking_lot::{Mutex, RwLock};
 use pyo3::{
@@ -1203,7 +1202,7 @@ impl Nac3 {
             string_store: Arc::new(string_store.into()),
             exception_ids: Arc::default(),
             deferred_eval_store: DeferredEvaluationStore::new(),
-            special_ids: SpecialPythonId::default(),
+            special_ids: Default::default(),
             llvm_options: CodeGenLLVMOptions {
                 opt_level: OptimizationLevel::Default,
                 target: isa.get_llvm_target_options(),
@@ -1219,8 +1218,8 @@ impl Nac3 {
         content_modules: &PySet,
     ) -> PyResult<()> {
         let (modules, class_ids) =
-            Python::with_gil(|py| -> PyResult<(IndexMap<u64, PyObject>, HashSet<u64>)> {
+            Python::with_gil(|py| -> PyResult<(HashMap<u64, PyObject>, HashSet<u64>)> {
-                let mut modules: IndexMap<u64, PyObject> = IndexMap::new();
+                let mut modules: HashMap<u64, PyObject> = HashMap::new();
                 let mut class_ids: HashSet<u64> = HashSet::new();
 
                 let id_fn = PyModule::import(py, "builtins")?.getattr("id")?;