Various fixes

Author: encounter

.github/workflows/build.yaml

@@ -236,6 +236,7 @@ jobs:
         uses: dtolnay/rust-toolchain@nightly
         with:
           targets: wasm32-wasip2
+          components: rust-src
       - name: Cache Rust workspace
         uses: Swatinem/rust-cache@v2
       - name: Install dependencies

objdiff-cli/Cargo.toml

@@ -18,7 +18,7 @@ argp = "0.4"
 crossterm = "0.28"
 enable-ansi-support = "0.2"
 memmap2 = "0.9"
-objdiff-core = { path = "../objdiff-core", features = ["ppc", "std", "config", "dwarf", "bindings", "serde"] }
+objdiff-core = { path = "../objdiff-core", features = ["all"] }
 prost = "0.13"
 ratatui = "0.29"
 rayon = "1.10"

objdiff-core/Cargo.toml

@@ -26,7 +26,7 @@ all = [
     "arm64",
     "mips",
     "ppc",
-    "x86",
+    # "x86",
 ]
 # Implicit, used to check if any arch is enabled
 any-arch = [
@@ -193,20 +193,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 syn = { version = "2.0", optional = true }
 
-# Enable all features for tests
 [dev-dependencies]
-objdiff-core = { path = ".", features = [
-    # Features
-    "bindings",
-    "build",
-    "config",
-    "dwarf",
-    "serde",
-    # Architectures
-    "mips",
-    "ppc",
-#    "x86",
-    "arm",
-    "arm64",
-] }
+# Enable all features for tests
+objdiff-core = { path = ".", features = ["all"] }
 insta = "1.42.1"

objdiff-core/src/arch/mips.rs

@@ -285,9 +285,7 @@ fn push_args(
                 } else {
                     arg_cb(InstructionPart::Arg(InstructionArg::Value(
                         InstructionArgValue::Opaque(
-                            op.display(instruction, display_flags, None::<&str>)
-                                .to_string()
-                                .into(),
+                            op.display(instruction, display_flags, None::<&str>).to_string().into(),
                         ),
                     )))?;
                 }

objdiff-core/src/diff/data.rs

@@ -107,11 +107,7 @@ fn diff_data_relocs_for_range<'left, 'right>(
         if reloc_eq(left_obj, right_obj, &left_reloc, &right_reloc) {
             diffs.push((DataDiffKind::None, Some(left_reloc), Some(right_reloc)));
         } else {
-            diffs.push((
-                DataDiffKind::Replace,
-                Some(left_reloc),
-                Some(right_reloc),
-            ));
+            diffs.push((DataDiffKind::Replace, Some(left_reloc), Some(right_reloc)));
         }
     }
     for right_reloc in right_section.relocations.iter() {

objdiff-core/tests/arch_x86.rs

@@ -38,7 +38,7 @@ float-ord = "0.3"
 font-kit = "0.14"
 globset = { version = "0.4", features = ["serde1"] }
 log = "0.4"
-objdiff-core = { path = "../objdiff-core", features = ["ppc", "arm", "arm64", "mips", "std", "config", "dwarf", "bindings", "serde", "build"] }
+objdiff-core = { path = "../objdiff-core", features = ["all"] }
 open = "5.3"
 png = "0.17"
 pollster = "0.4"

objdiff-gui/Cargo.toml

@@ -18,12 +18,13 @@
   "scripts": {
     "build": "npm run build:wasm && npm run build:transpile && npm run build:lib",
     "build:wasm": "cargo +nightly -Zbuild-std=panic_abort,core,alloc -Zbuild-std-features=compiler-builtins-mem build --target wasm32-wasip2 --release --no-default-features",
-    "build:transpile": "jco transpile ../target/wasm32-wasip2/release/objdiff_wasm.wasm --no-nodejs-compat --no-wasi-shim --no-namespaced-exports --map wasi:logging/logging=./wasi-logging.js -o pkg --name objdiff",
+    "build:transpile": "jco transpile ../target/wasm32-wasip2/release/objdiff_wasm.wasm --no-nodejs-compat --no-wasi-shim --no-namespaced-exports --map wasi:logging/logging=./wasi-logging.js --optimize -o pkg --name objdiff",
     "build:lib": "rslib build"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.3",
-    "@bytecodealliance/jco": "^1.9.1",
+    "@bytecodealliance/jco": "^1.10.1",
+    "@bytecodealliance/preview2-shim": "^0.17.1",
     "@rslib/core": "^0.4.1",
     "typescript": "^5.7.2"
   }