[rust] migrating to kj::from (#5209)

see capnproto/capnproto#2402

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/4af6d742d88c131f6b1b4d315707483eb6897cb5"
-STRIP_PREFIX = "capnproto-capnproto-4af6d74/c++"
-SHA256 = "5fbac64487684ac5dd27198d48b8aefb863a85bb48e96b8132fca6a08a455576"
+URL = "https://github.com/capnproto/capnproto/tarball/c525eb1680bdd94f3d814f81f148643ee5086525"
+STRIP_PREFIX = "capnproto-capnproto-c525eb1/c++"
+SHA256 = "7b60e840dbc62bb3140a9dff9ae38253688fc63722dcea6769108e9356e6362b"
 TYPE = "tgz"
-COMMIT = "4af6d742d88c131f6b1b4d315707483eb6897cb5"
+COMMIT = "c525eb1680bdd94f3d814f81f148643ee5086525"
 
 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/552c0b589a9a92c706e547a4a2ad4f36deaf580b"
-STRIP_PREFIX = "cloudflare-workerd-cxx-552c0b5"
-SHA256 = "ab86d593e636604bd07c5d3af6e99d4dcb7a0763ee2b28ae8edea5ef915b1778"
+URL = "https://github.com/cloudflare/workerd-cxx/tarball/f0adca0c1bc030dbf051f0348fd4af8c2b1f6fac"
+STRIP_PREFIX = "cloudflare-workerd-cxx-f0adca0"
+SHA256 = "3e727bf2c060aeba327f7e91711ccd6017f9e1d937c289fb9d2f5d380000fcfa"
 TYPE = "tgz"
-COMMIT = "552c0b589a9a92c706e547a4a2ad4f36deaf580b"
+COMMIT = "f0adca0c1bc030dbf051f0348fd4af8c2b1f6fac"
 
 def dep_workerd_cxx():
     http_archive(

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

@@ -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, from<Rust>(path));
+      auto resourceName = jsg::newExternalOneByteString(js, kj::from<Rust>(path));
       v8::ScriptOrigin origin(resourceName, resourceLineOffset, resourceColumnOffset,
           resourceIsSharedCrossOrigin, scriptId, {}, resourceIsOpaque, isWasm, isModule);
 
-      auto contentStr = jsg::newExternalOneByteString(js, from<Rust>(source));
+      auto contentStr = jsg::newExternalOneByteString(js, kj::from<Rust>(source));
       auto source = v8::ScriptCompiler::Source(contentStr, origin, nullptr);
       auto module =
           jsg::check(v8::ScriptCompiler::CompileModule(js.v8Isolate, &source, compileOptions));

src/rust/kj/ffi.c++

@@ -18,7 +18,7 @@ kj::Promise<void> connect(HttpService& service,
     AsyncIoStream& connection,
     ConnectResponse& response,
     HttpConnectSettings settings) {
-  auto strHost = kj::str(kj_rs::from<kj_rs::Rust>(host).asChars());
+  auto strHost = kj::str(kj::from<kj_rs::Rust>(host).asChars());
   return service.connect(strHost, headers, connection, response,
       {
         .useTls = settings.use_tls,

src/rust/kj/ffi.h

@@ -95,7 +95,7 @@ inline kj::Promise<void> request(HttpService& service,
     const HttpHeaders& headers,
     AsyncInputStream& request_body,
     HttpServiceResponse& response) {
-  auto strUrl = kj::str(kj_rs::from<kj_rs::Rust>(url).asChars());
+  auto strUrl = kj::str(kj::from<kj_rs::Rust>(url).asChars());
   co_await service.request(method, strUrl, headers, request_body, response);
 }
 

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

@@ -17,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 from<RustCopy>(rust_result);
+  return kj::from<RustCopy>(rust_result);
 }
 
 namespace workerd::api {

src/workerd/server/workerd-api.c++

@@ -491,7 +491,7 @@ Worker::Script::Module WorkerdApi::readModuleConf(config::Worker::Module::Reader
 
           if (output.success) {
             return Worker::Script::EsModule{
-              .body = ::kj_rs::from<Rust>(output.code), .ownBody = kj::mv(output.code)};
+              .body = ::kj::from<Rust>(output.code), .ownBody = kj::mv(output.code)};
           }
 
           auto description = kj::str("Error transpiling ", conf.getName(), " : ", output.error);