fix: wasm profile and small fixes

Author: andreas-karlsson

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+  "rust-analyzer.cargo.features": [],
+  "protoc": {
+    "options": ["-I/${workspaceRoot}/confidence-resolver/protos"]
+  }
+}

Cargo.toml

@@ -7,3 +7,12 @@ members = [
     "confidence-resolver",
     "confidence-cloudflare-resolver"
 ]
+
+
+[profile.wasm]
+inherits = "release"
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "unwind"
+strip = "symbols"

Makefile

@@ -25,7 +25,8 @@ resolver-lint:
 
 rust-guest:
 	@echo "Building rust-guest (wasm32-unknown-unknown)..."
-	cargo build -p rust-guest --target wasm32-unknown-unknown --release
+	cargo build -p rust-guest --target wasm32-unknown-unknown --profile wasm
+	@echo "Final WASM size: $$(/bin/ls -lh target/wasm32-unknown-unknown/release/rust_guest.wasm | awk '{print $$5}')"
 
 rust-guest-lint:
 	@echo "Linting rust-guest (wasm32-unknown-unknown)..."
@@ -62,5 +63,6 @@ run-java-host: rust-guest
 test: resolver-test
 
 lint: resolver-lint cloudflare-lint rust-guest-lint
+	cargo fmt --all --check
 
 build: resolver cloudflare rust-guest

confidence-resolver/build.rs

@@ -21,55 +21,22 @@ fn main() -> Result<()> {
 
     let mut config = prost_build::Config::new();
 
-    config.type_attribute(
+    [
         "confidence.flags.admin.v1.ClientResolveInfo.EvaluationContextSchemaInstance",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.type",
-        "#[derive(Eq, Ord, PartialOrd)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.VersionSemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.CountrySemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.TimestampSemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.DateSemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.EntitySemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.EnumSemanticType",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
-
-    config.type_attribute(
         "confidence.flags.admin.v1.ContextFieldSemanticType.EnumSemanticType.EnumValue",
-        "#[derive(Eq, PartialOrd, Ord)]",
-    );
+    ]
+    .iter()
+    .for_each(|&p| {
+        config.type_attribute(p, "#[derive(Eq, PartialOrd, Ord)]");
+    });
 
     config
         .file_descriptor_set_path(&descriptor_path)

wasm/rust-guest/Cargo.toml

@@ -21,23 +21,6 @@ arc-swap = "1.7.1"
 prost-build = "0.12"
 
 
-[profile.release]
-# Optimize for size
-opt-level = 'z'  # Optimize for size instead of speed
-lto = true       # Enable link-time optimization
-codegen-units = 1  # Reduce number of codegen units to increase optimization
-panic = 'abort'  # Remove panic unwinding code
-strip = true     # Strip symbols from binary
-# Disable incremental compilation
-incremental = false
-# Disable debug assertions
-debug = false
-# Disable debug info
-debug-assertions = false
-# Disable overflow checks
-overflow-checks = false
-# Disable rpath
-rpath = false
 
 [package.metadata.cargo-machete]
 ignored = ["prost", "prost-types", "prost-build"]