Switch from HashMap/Set to {BTree,Index}Map/Set in derive (for where …

…it affects output order)
RustPython · coolreader18 · Mar 3, 2023 · Mar 3, 2023 · Mar 3, 2023 · Mar 3, 2023
commit a710e65ffbb198ac5834db77e2103e8469fc7cd4
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/derive-impl/Cargo.toml b/derive-impl/Cargo.toml
@@ -16,11 +16,11 @@ rustpython-doc = { workspace = true }
 itertools = { workspace = true }
 syn = { workspace = true, features = ["full", "extra-traits"] }
 
-maplit = "1.0.2"
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn-ext = { version = "0.5.0&qu
8000
ot;, features = ["full"] }
 textwrap = { version = "0.16.1", default-features = false }
+indexmap = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/derive-impl/src/compile_bytecode.rs b/derive-impl/src/compile_bytecode.rs
@@ -19,7 +19,7 @@ use quote::quote;
 use rustpython_compiler_core::{Mode, bytecode::CodeObject, frozen};
 use std::sync::LazyLock;
 use std::{
-    collections::HashMap,
+    collections::BTreeMap,
     env, fs,
     path::{Path, PathBuf},
 };
@@ -83,20 +83,21 @@ impl CompilationSource {
         mode: Mode,
         module_name: String,
         compiler: &dyn Compiler,
-    ) -> Result<HashMap<String, CompiledModule>, Diagnostic> {
+    ) -> Result<BTreeMap<String, CompiledModule>, Diagnostic> {
         match &self.kind {
             CompilationSourceKind::Dir(rel_path) => self.compile_dir(
                 &CARGO_MANIFEST_DIR.join(rel_path),
                 String::new(),
                 mode,
                 compiler,
             ),
-            _ => Ok(hashmap! {
-                module_name.clone() => CompiledModule {
+            _ => Ok(BTreeMap::from([(
+                module_name.clone(),
+                CompiledModule {
                     code: self.compile_single(mode, module_name, compiler)?,
                     package: false,
                 },
-            }),
+            )])),
         }
     }
 
@@ -136,8 +137,8 @@ impl CompilationSource {
         parent: String,
         mode: Mode,
         compiler: &dyn Compiler,
-    ) -> Result<HashMap<String, CompiledModule>, Diagnostic> {
-        let mut code_map = HashMap::new();
+    ) -> Result<BTreeMap<String, CompiledModule>, Diagnostic> {
+        let mut code_map = BTreeMap::new();
         let paths = fs::read_dir(path)
             .or_else(|e| {
                 if cfg!(windows) {

diff --git a/derive-impl/src/lib.rs b/derive-impl/src/lib.rs
@@ -4,9 +4,6 @@
 
 extern crate proc_macro;
 
-#[macro_use]
-extern crate maplit;
-
 #[macro_use]
 mod error;
 #[macro_use]

diff --git a/derive-impl/src/pyclass.rs b/derive-impl/src/pyclass.rs
@@ -4,9 +4,10 @@ use crate::util::{
     ItemMeta, ItemMetaInner, ItemNursery, SimpleItemMeta, format_doc, pyclass_ident_and_attrs,
     pyexception_ident_and_attrs, text_signature,
 };
+use indexmap::IndexMap;
 use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
 use quote::{ToTokens, quote, quote_spanned};
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::str::FromStr;
 use syn::{Attribute, Ident, Item, Result, parse_quote, spanned::Spanned};
 use syn_ext::ext::*;
@@ -1028,7 +1029,7 @@ impl ToTokens for MethodNursery {
 #[derive(Default)]
 #[allow(clippy::type_complexity)]
 struct GetSetNursery {
-    map: HashMap<(String, Vec<Attribute>), (Option<Ident>, Option<Ident>, Option<Ident>)>,
+    map: IndexMap<(String, Vec<Attribute>), (Option<Ident>, Option<Ident>, Option<Ident>)>,
     validated: bool,
 }
 
@@ -1121,7 +1122,7 @@ impl ToTokens for GetSetNursery {
 #[derive(Default)]
 #[allow(clippy::type_complexity)]
 struct MemberNursery {
-    map: HashMap<(String, MemberKind), (Option<Ident>, Option<Ident>)>,
+    map: BTreeMap<(String, MemberKind), (Option<Ident>, Option<Ident>)>,
     validated: bool,
 }
 
@@ -1130,7 +1131,7 @@ enum MemberItemKind {
     Set,
 }
 
-#[derive(Eq, PartialEq, Hash)]
+#[derive(Eq, PartialEq, Ord, PartialOrd)]
 enum MemberKind {
     Bool,
     ObjectEx,

diff --git a/derive-impl/src/pymodule.rs b/derive-impl/src/pymodule.rs
@@ -6,7 +6,8 @@ use crate::util::{
 };
 use proc_macro2::{Delimiter, Group, TokenStream, TokenTree};
 use quote::{ToTokens, quote, quote_spanned};
-use std::{collections::HashSet, str::FromStr};
+use std::collections::{BTreeSet, HashSet};
+use std::str::FromStr;
 use syn::{Attribute, Ident, Item, Result, parse_quote, spanned::Spanned};
 use syn_ext::ext::*;
 use syn_ext::types::PunctuatedNestedMeta;
@@ -472,7 +473,7 @@ impl ModuleItem for FunctionItem {
             if self.py_attrs.is_empty() {
                 vec![py_name]
             } else {
-                let mut py_names = HashSet::new();
+                let mut py_names = BTreeSet::new();
                 py_names.insert(py_name);
                 for attr_index in self.py_attrs.iter().rev() {
                     let mut loop_unit = || {