Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace HashMap with BTreeMap to remove non-determinism in build #104

Merged
merged 1 commit into from
Feb 20, 2025
Merged

Replace HashMap with BTreeMap to remove non-determinism in build #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use rust_i18n_support::{
is_debug, load_locales, I18nConfig, DEFAULT_MINIFY_KEY, DEFAULT_MINIFY_KEY_LEN,
DEFAULT_MINIFY_KEY_PREFIX, DEFAULT_MINIFY_KEY_THRESH,
};
use std::collections::HashMap;
use std::collections::BTreeMap;
use syn::{parse_macro_input, Expr, Ident, LitBool, LitStr, Token};

mod minify_key;
Expand Down Expand Up @@ -268,7 +268,7 @@ pub fn i18n(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
}

fn generate_code(
translations: HashMap<String, HashMap<String, String>>,
translations: BTreeMap<String, BTreeMap<String, String>>,
args: Args,
) -> proc_macro2::TokenStream {
let mut all_translations = Vec::<proc_macro2::TokenStream>::new();
Expand Down
16 changes: 8 additions & 8 deletions crates/support/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use normpath::PathExt;
use std::fs::File;
use std::io::prelude::*;
use std::{collections::HashMap, path::Path};
use std::{collections::BTreeMap, path::Path};

mod atomic_str;
mod backend;
Expand All @@ -19,7 +19,7 @@ pub use minify_key::{

type Locale = String;
type Value = serde_json::Value;
type Translations = HashMap<Locale, Value>;
type Translations = BTreeMap<Locale, Value>;

pub fn is_debug() -> bool {
std::env::var("RUST_I18N_DEBUG").unwrap_or_else(|_| "0".to_string()) == "1"
Expand All @@ -43,9 +43,9 @@ fn merge_value(a: &mut Value, b: &Value) {
pub fn load_locales<F: Fn(&str) -> bool>(
locales_path: &str,
ignore_if: F,
) -> HashMap<String, HashMap<String, String>> {
let mut result: HashMap<String, HashMap<String, String>> = HashMap::new();
let mut translations = HashMap::new();
) -> BTreeMap<String, BTreeMap<String, String>> {
let mut result: BTreeMap<String, BTreeMap<String, String>> = BTreeMap::new();
let mut translations = BTreeMap::new();
let locales_path = match Path::new(locales_path).normalize() {
Ok(p) => p,
Err(e) => {
Expand Down Expand Up @@ -200,7 +200,7 @@ fn parse_file_v2(key_prefix: &str, data: &serde_json::Value) -> Option<Translati
// zh-CN: 欢迎
if text.is_string() {
let key = format_keys(&[key_prefix, key]);
let sub_trs = HashMap::from([(key, text.clone())]);
let sub_trs = BTreeMap::from([(key, text.clone())]);
let sub_value = serde_json::to_value(&sub_trs).unwrap();

trs.entry(locale.clone())
Expand Down Expand Up @@ -253,8 +253,8 @@ fn format_keys(keys: &[&str]) -> String {
.join(".")
}

fn flatten_keys(prefix: &str, trs: &Value) -> HashMap<String, String> {
let mut v = HashMap::<String, String>::new();
fn flatten_keys(prefix: &str, trs: &Value) -> BTreeMap<String, String> {
let mut v = BTreeMap::<String, String>::new();
let prefix = prefix.to_string();

match &trs {
Expand Down