[workerd-cxx] merge kj-rs project in (#23)

Author: mikea

.bazelrc

@@ -31,6 +31,21 @@ build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
 build:clippy --output_groups=+clippy_checks
 build:clippy  --@rules_rust//:clippy_flags=-Dclippy::all,-Dclippy::pedantic
 
+## Sanitizers
+
+build:sanitizer-common --copt="-fsanitize-link-c++-runtime" --linkopt="-fsanitize-link-c++-runtime"
+build:sanitizer-common --copt="-Og"
+build:sanitizer-common --copt="-g" --strip=never
+build:sanitizer-common --copt="-fno-optimize-sibling-calls"
+build:sanitizer-common --copt="-fno-omit-frame-pointer" --copt="-mno-omit-leaf-frame-pointer"
+
+# Address sanitizer (https://github.com/google/sanitizers/wiki/AddressSanitizer)
+build:asan --config=sanitizer-common
+build:asan --copt="-fsanitize=address" --linkopt="-fsanitize=address"
+build:asan --test_env=ASAN_OPTIONS=abort_on_error=true
+build:asan --test_env=LSAN_OPTIONS=report_objects=1
+build:asan --test_env=KJ_CLEAN_SHUTDOWN=1
+
 ###############################################################################
 ## Custom user flags
 ##

.github/workflows/ci.yml

@@ -49,6 +49,16 @@ jobs:
       - run: sudo apt-get install lld
       - run: bazel build --config=clippy ... --verbose_failures
 
+  asan:
+    name: Address Sanitizer
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo apt-get install lld
+      - run: bazel test --config=asan ... --verbose_failures
+
   clang-tidy:
     name: Clang Tidy
     runs-on: ubuntu-latest

.vscode/settings.json

@@ -1,5 +1,15 @@
 {
     "search.exclude": {
-        "**/target": true
+        "bazel-*/": true
+    },
+    "rust-analyzer.workspace.discoverConfig": {
+        "command": [
+            "just",
+            "_rust-analyzer"
+        ],
+        "progressLabel": "generating rust analyzer config",
+        "filesToWatch": [
+            "BUILD.bazel"
+        ]
     }
 }

MODULE.bazel

@@ -28,6 +28,3 @@ use_repo(crate_repositories, "crates.io", "vendor")
 
 capnp_cpp = use_extension("//:capnp_cpp.bzl", "capnp_cpp")
 use_repo(capnp_cpp, "capnp-cpp")
-
-kj_rs = use_extension("//:kj_rs.bzl", "kj_rs")
-use_repo(kj_rs, "kj-rs")

MODULE.bazel.lock

@@ -189,7 +189,7 @@ pub(super) fn write(out: &mut OutFile) {
         writeln!(out, "#endif");
     }
     if kj_rs && !cxx_header {
-        writeln!(out, "#include <kj-rs/kj-rs.h>");
+        writeln!(out, "#include \"kj-rs/kj-rs.h\"");
     }
 }
 

gen/src/include.rs

@@ -3,7 +3,7 @@ alias b := build
 alias t := test
 
 watch +WATCH_TARGET='test':
-    watchexec -rc -w tests -w src -w gen -w macro -w syntax -- just {{WATCH_TARGET}}
+    watchexec -rc -w tests -w src -w gen -w macro -w syntax -w kj-rs -- just {{WATCH_TARGET}}
 
 build:
     bazel build //...
@@ -15,4 +15,22 @@ clippy:
     bazel build --config=clippy  //...
 
 cargo-update:
-    bazel run //third-party:vendor
+    bazel run //third-party:vendor
+
+format: rustfmt clang-format
+
+rustfmt:
+    bazel run @rules_rust//:rustfmt
+
+clang-format:
+    clang-format -i kj/*.h kj/*.c++ kj/tests/*.h kj/tests/*.c++
+
+
+compile-commands:
+    bazel run @hedron_compile_commands//:refresh_all
+    
+# called by rust-analyzer discoverConfig (quiet recipe with no output)
+@_rust-analyzer:
+  rm -rf ./rust-project.json
+  # rust-analyzer doesn't like stderr output, redirect it to /dev/null
+  bazel run @rules_rust//tools/rust_analyzer:discover_bazel_rust_project 2>/dev/null

justfile

@@ -0,0 +1,56 @@
+load("//tools/bazel:rust_cxx_bridge.bzl", "rust_cxx_bridge")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+cc_library(
+    name = "kj-rs-lib",
+    srcs = glob(["*.c++"]),
+    hdrs = glob(["*.h"]),
+    include_prefix = "kj-rs",
+    linkstatic = select({
+        "@platforms//os:windows": True,
+        "//conditions:default": False,
+    }),
+    deps = [
+        ":bridge",
+    ],
+)
+
+rust_library(
+    name = "kj-rs",
+    srcs = glob(["*.rs"]),
+    compile_data = glob(["*.h"]),
+    edition = "2024",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":bridge",
+        ":kj-rs-lib",
+        "@workerd-cxx//:cxx",
+        "@crates.io//:static_assertions",
+    ],
+)
+
+rust_cxx_bridge(
+    name = "bridge",
+    src = "lib.rs",
+    hdrs = glob(["*.h"]),
+    include_prefix = "kj-rs",
+    deps = [
+        ":cxx",
+        "@capnp-cpp//src/kj:kj",
+        "@capnp-cpp//src/kj:kj-async",
+        "@workerd-cxx//:cxx",
+    ],
+)
+
+genrule(
+    name = "cxx/generated",
+    outs = ["cxx.h"],
+    cmd = "$(location @workerd-cxx//:codegen) --header > \"$@\"",
+    tools = ["@workerd-cxx//:codegen"],
+)
+
+cc_library(
+    name = "cxx",
+    hdrs = ["cxx.h"],
+    include_prefix = "rust",
+)

kj-rs/BUILD.bazel

@@ -0,0 +1,3 @@
+# KJ
+
+This directory contains supporting code for the integration with kj library.