Optimize calc24 hashing and deduplication

    Use structural equality for expression sets and exact multiset keys
    for subset pruning in both Rust and C++.

    Improve expression ownership and move paths, widen cached hashes,
    and raise the C++ optimization level.

    Also refresh Cargo feature declarations and rustfmt configuration.

Author: mhfan

Cargo.toml

@@ -1,6 +1,6 @@
 
 ### https://doc.rust-lang.org/cargo/reference/manifest.html
-# rustup override set nightly
+# Optional for nightly-only experiments: rustup override set nightly
 
 [package]
 name = "inrust"
@@ -9,18 +9,19 @@ edition.workspace = true
 version.workspace = true
 license.workspace = true
 authors.workspace = true
-   homepage.workspace = true
- repository.workspace = true
+repository.workspace = true
+  homepage.workspace = true
+
 description = "Accumulate knowledge of my study on Rust language"
 categories  = [ "command-line-utilities", "games", "mathematics" ]
 keywords = [ "24-game", "24-solver", "24-puzzle", "24-challenge" ]
 exclude  = [ "README-DSP.md", "tmp" ]   # "tests", "benches", "fuzz"
 #publish  = [ "crates-io" ]  # cargo publish --registry crates-io
 
-#build = "build.rs"     # default, build = false
+#build = "build.rs"     # auto-discovered by default; use `build = false` to disable it
 
 [workspace.package]
-edition = "2021"    # use 'cargo fix' to fix for compatibility with different Rust edition.
+edition = "2021"    # use `cargo fix --edition` before migrating to a newer edition
 version = "0.3.9"
 #readme = "README.md"
 license = "MIT OR Apache-2.0"
@@ -54,8 +55,8 @@ cxx   = { version = "1.0", optional = true }
 dhat  = { version = "0.3", optional = true }
 pprof = { version = "0.15", features = [ "flamegraph", "criterion" ], optional = true }
 
-gxhash = { version = "3.4", optional = true }
  ahash = { version = "0.8", optional = true }    # https://github.com/tkaitchuck/aHash
+gxhash = { version = "3.4", optional = true }
 num-bigint   = { version = "0.4", optional = true }
 num-rational = { version = "0.4", optional = true }
 serde = { version = "1", features = [ "derive" ], optional = true }
@@ -70,9 +71,6 @@ regex = "1.12"
 rand = "0.9"
 #csv = "1.1"
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
-
 [build-dependencies]  # used for compiling build script
 cc = { version = "1.2", features = [ "parallel" ], optional = true }
 cxx-build = { version = "1.0", optional = true }
@@ -81,10 +79,10 @@ chrono = "0.4"
 
 [features]
 debug = []
-cli = [ "yansi", "rand" ]
-cxx = [ "dep:cxx", "cxx-build" ]   # implied by optional dependency
-default = [ "cc", "cli", "ahash" ] # "gxhash", "cxx", "serde", "num-rational", "num-bigint",
-dhat-heap = [ "dhat" ]
+cli = [ "dep:yansi", "dep:rand" ]
+cxx = [ "dep:cxx", "dep:cxx-build" ]   # `dep:` avoids implicit dependency features
+default = [ "cc", "cli", "ahash" ]     # opt-in alternatives: "gxhash", "cxx", "serde", etc.
+dhat-heap = [ "dep:dhat" ]
 
 [[bin]]
 name = "inrust"
@@ -93,8 +91,7 @@ required-features = [ "cli" ]
 [[bench]]
 name = "calc24_bench"
 #path = "benches/calc24_bench.rs"
-#cargo_bench_support = true
-#html_reports = false
+# Criterion HTML reports are configured by Criterion, not as `[[bench]]` keys.
 harness = false
 
 #[lib]
@@ -109,21 +106,23 @@ opt-level = 1   # Enable a small amount of optimization in debug mode
 opt-level = 3   # Enable high optimizations for dependencies, but not for own code.
 
 [profile.release]
-codegen-units = 1   # Perform optimizations on all codegen units.
-strip = 'debuginfo' # keep 'symbols'
-panic = 'abort' # Do not perform backtrace for panic on release builds.
+codegen-units = 1   # Optimize the crate as one codegen unit; slower build, potentially faster code.
+strip = 'debuginfo' # Remove debug information while retaining symbols where the platform supports it.
+panic = 'abort' # Abort instead of unwinding; panic hooks may still print a message/backtrace.
 #debug = 'full'  # for flamegraph
 #opt-level = 3   # default level
-lto = 'fat' # true
+lto = 'fat' # `true` also selects fat LTO.
 
 #cargo build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort
 
 #[profile.release-lto]  # customized profile
 #inherits = "release"
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+
 [workspace]
 members = [] #"inperse", "indiox", #"fuzz",
     #"inyew", "inyew/src-tauri",  #"inslint", "inegui",
 #exclude = [ "indsp", "inbevy", "inwasm", "cortex-m" ]
-#resolver = "2"  # default for 2021 edition?
-
+#resolver = "2"  # Match edition 2021 dependency-feature resolution explicitly.

benches/calc24_bench.rs

@@ -23,7 +23,7 @@ fn bench_24calc(c: &mut Criterion) {
     let nums = nums.into_iter().map(|n| n.into()).collect::<Vec<_>>();
     let (goal, mut cnt) = (goal.into(), 0);
 
-    for algo in [ DynProg, Construct ] {    // XXX: SplitSet, Inplace,
+    for algo in [ DynProg, SplitSet, Inplace, Construct ] {    // XXX:
         let mut bench_closure = |algo, cxx: &str| {
             group.bench_function(format!("{cxx}{algo:?}"), |b| b.iter(|| {
                 if cxx.is_empty() { cnt = calc24_coll(&goal, &nums, algo).len(); } else {

build.rs

@@ -20,7 +20,7 @@ fn main() {     // https://doc.rust-lang.org/stable/cargo/reference/build-script
 
     #[cfg(any(feature = "cc", feature = "cxx"))] { calc24_file.set_extension("cpp");
         build.cpp(true).flag("-std=c++20").flag("-Wno-misleading-indentation")
-        .opt_level(2).define("NDEBUG", None).file(&calc24_file).compile("calc24");
+        .opt_level(3).define("NDEBUG", None).file(&calc24_file).compile("calc24");
 
         println!("cargo:rerun-if-changed={}", calc24_file.display());
         println!("cargo:rerun-if-changed={}", calc24_file.with_extension("h").display());

indiox/Cargo.toml

@@ -16,7 +16,7 @@ version = "0.1.6"
 [dependencies]
 dioxus = { version = "0.7" } #, features = [ "fullstack", "router" ]
 
-web-sys = { version = "=0.3.78", features = [ 'Window', 'Document',
+web-sys = { version = "0.3", features = [ 'Window', 'Document',
     'HtmlInputElement', 'HtmlCollection', #'HtmlCanvasElement', 'CanvasRenderingContext2d'
 ] } # XXX: failed to build on macOS for web-sys v0.3.79~82 and wasm-bindgen v0.2.102~105
 

rustfmt.toml

@@ -3,27 +3,47 @@
 # rustfmt --print-config default    # rustfmt --print-config current rustfmt.toml
 
 unstable_features = true
-edition = "2021"
-version = "Two"
+style_edition = "2024"
+#edition = "2024"
+
+#ignore = ["/"] # Skip formatting files
+
+use_small_heuristics = "Max"
+max_width = 96
+
+#array_width = 80
+#chain_width = 80
+#fn_call_width = 80
+#struct_lit_width = 80
+#attr_fn_like_width = 80
+#struct_variant_width = 80
+#single_line_if_else_max_width  = 80
+#single_line_let_else_max_width = 80
+
+short_array_element_width_threshold = 32
+#enum_discrim_align_threshold = 32
+#struct_field_align_threshold = 32
+inline_attribute_width = 96
+comment_width = 96
+
 binop_separator = "Back"
 fn_params_layout = "Compressed"
 brace_style = "PreferSameLine"
+imports_granularity = "Crate" # "Module"
+group_imports = "StdExternalCrate"
+#imports_indent = "Visual"
+#indent_style   = "Visual"
+
 condense_wildcard_suffixes  = true
 format_code_in_doc_comments = true
 format_macro_matchers = true
+format_macro_bodies = false
 format_strings = true
 fn_single_line = true
-#imports_indent = "Visual"
-#indent_style   = "Visual"
+wrap_comments  = true
 match_arm_blocks  = false
 where_single_line = true
 overflow_delimited_expr  = true
 use_field_init_shorthand = true
 normalize_doc_attributes = true
-imports_granularity = "Module"
-group_imports = "StdExternalCrate"
-short_array_element_width_threshold = 20
-enum_discrim_align_threshold = 20
-inline_attribute_width = 80
-struct_lit_width = 50