kj-rs update, using conversions from the library (#4447)

Author: mikea

build/deps/gen/dep_capnp_cpp.bzl

@@ -2,11 +2,11 @@
 
 load("@//:build/http.bzl", "http_archive")
 
-URL = "https://github.com/capnproto/capnproto/tarball/6908704a0729fc202e97c3f31644fff5771bad6f"
-STRIP_PREFIX = "capnproto-capnproto-6908704/c++"
-SHA256 = "f6942780061a1a45a89f22e90f3c3496b648e261c14cf452499d6984d07dff99"
+URL = "https://github.com/capnproto/capnproto/tarball/5b8cae919e37898d47290e5edd777e1aa6be802a"
+STRIP_PREFIX = "capnproto-capnproto-5b8cae9/c++"
+SHA256 = "bb508a1762ca4af7b01162c38a2153e4b77595f612aeb27d2b560cc16302bf14"
 TYPE = "tgz"
-COMMIT = "6908704a0729fc202e97c3f31644fff5771bad6f"
+COMMIT = "5b8cae919e37898d47290e5edd777e1aa6be802a"
 
 def dep_capnp_cpp():
     http_archive(

build/deps/gen/dep_workerd_cxx.bzl

@@ -2,11 +2,11 @@
 
 load("@//:build/http.bzl", "http_archive")
 
-URL = "https://github.com/cloudflare/workerd-cxx/tarball/33a35299d325c744edbb58da39e6f29eed42b024"
-STRIP_PREFIX = "cloudflare-workerd-cxx-33a3529"
-SHA256 = "a9749efd3d8e60c1a5e02d138eab6caa1eabe565e97acb69022d19770217a26d"
+URL = "https://github.com/cloudflare/workerd-cxx/tarball/832fbf026db0d6efcaa48f7ad3aa23044d41a73c"
+STRIP_PREFIX = "cloudflare-workerd-cxx-832fbf0"
+SHA256 = "bb1d8ef5fee85ced8be67bc0b5e06d32e2b8b8c4973bd75a1ca7b4f676cfcaae"
 TYPE = "tgz"
-COMMIT = "33a35299d325c744edbb58da39e6f29eed42b024"
+COMMIT = "832fbf026db0d6efcaa48f7ad3aa23044d41a73c"
 
 def dep_workerd_cxx():
     http_archive(

src/rust/cxx-integration-test/cxx-rust-integration-test.c++

@@ -6,6 +6,9 @@
 
 #include <kj/async.h>
 #include <kj/test.h>
+#include <kj-rs/kj-rs.h>
+
+using namespace kj_rs;
 
 // Test generic rust/c++ integration boundary.
 // See src/rust/cxx-integration-tests for rust backend.

src/rust/cxx-integration/BUILD.bazel

@@ -10,6 +10,7 @@ wd_rust_crate(
     deps = [
         "@crates_vendor//:tokio",
         "@crates_vendor//:tracing",
+        "@workerd-cxx//kj-rs",
     ],
 )
 

src/rust/cxx-integration/cxx-bridge.h

@@ -7,10 +7,6 @@ mod ffi {
 
         fn trigger_panic(msg: &str);
     }
-
-    unsafe extern "C++" {
-        include!("workerd/rust/cxx-integration/cxx-bridge.h");
-    }
 }
 
 pub fn init() {

src/rust/cxx-integration/lib.rs

@@ -4,10 +4,10 @@
 #include <workerd/jsg/type-wrapper.h>
 #include <workerd/jsg/setup.h>
 
-#include <workerd/rust/cxx-integration/lib.rs.h>
-
 #include <capnp/serialize.h>
+#include <kj-rs/kj-rs.h>
 
+using namespace kj_rs;
 namespace workerd::rust::gen_compile_cache {
 
 namespace {
@@ -36,11 +36,11 @@ constexpr v8::ScriptCompiler::CompileOptions compileOptions = v8::ScriptCompiler
   auto data = ccIsolate.runInLockScope([&](CompileCacheIsolate::Lock& isolateLock) {
     return JSG_WITHIN_CONTEXT_SCOPE(isolateLock,
         isolateLock.newContext<CompilerCacheContext>().getHandle(isolateLock), [&](jsg::Lock& js) {
-      auto resourceName = jsg::newExternalOneByteString(js, fromRust(path));
+      auto resourceName = jsg::newExternalOneByteString(js, from<Rust>(path));
       v8::ScriptOrigin origin(resourceName, resourceLineOffset, resourceColumnOffset,
           resourceIsSharedCrossOrigin, scriptId, {}, resourceIsOpaque, isWasm, isModule);
 
-      auto contentStr = jsg::newExternalOneByteString(js, fromRust(source));
+      auto contentStr = jsg::newExternalOneByteString(js, from<Rust>(source));
       auto source = v8::ScriptCompiler::Source(contentStr, origin, nullptr);
       auto module =
           jsg::check(v8::ScriptCompiler::CompileModule(js.v8Isolate, &source, compileOptions));

src/rust/gen-compile-cache/cxx-bridge.c++

@@ -3,10 +3,11 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include <workerd/rust/python-parser/lib.rs.h>
-#include "workerd/rust/cxx-integration/lib.rs.h"
-
+#include <kj-rs/kj-rs.h>
 #include <kj/test.h>
 
+using namespace kj_rs;
+
 using ::edgeworker::rust::python_parser::get_imports;
 
 kj::Array<kj::String> parseImports(kj::ArrayPtr<kj::StringPtr> cpp_modules) {
@@ -16,7 +17,7 @@ kj::Array<kj::String> parseImports(kj::ArrayPtr<kj::StringPtr> cpp_modules) {
   }
   ::rust::Slice<::rust::Str const> rust_slice(rust_modules.begin(), rust_modules.size());
   auto rust_result = get_imports(rust_slice);
-  return workerd::fromRust(rust_result);
+  return from<RustCopy>(rust_result);
 }
 
 namespace workerd::api {

src/rust/python-parser/import_parsing.c++

@@ -4,9 +4,12 @@
 #include "dns.h"
 
 #include <workerd/jsg/exception.h>
-#include <workerd/rust/cxx-integration/cxx-bridge.h>
 #include <workerd/rust/dns/lib.rs.h>
 
+#include <kj-rs/kj-rs.h>
+
+using namespace kj_rs;
+
 namespace workerd::api::node {
 
 DnsUtil::CaaRecord DnsUtil::parseCaaRecord(kj::String record) {

src/workerd/api/node/dns.c++

@@ -5,9 +5,12 @@
 
 #include "ada.h"
 
-#include <workerd/rust/cxx-integration/cxx-bridge.h>
 #include <workerd/rust/net/lib.rs.h>
 
+#include <kj-rs/kj-rs.h>
+
+using namespace kj_rs;
+
 namespace workerd::api::node {
 
 namespace {