Skip to content

Commit 4f1b9a0

Browse files
authored
[rust] use 1.90.0 (#5276)
1 parent 31df859 commit 4f1b9a0

File tree

9 files changed

+13
-16
lines changed

9 files changed

+13
-16
lines changed

build/kj_test.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ def kj_test(
1515
testonly = True,
1616
srcs = [src],
1717
deps = [
18-
"//deps/rust:runtime",
1918
"@capnp-cpp//src/kj:kj-test",
2019
] + deps,
2120
linkstatic = select({

build/rust_toolchains.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi
33
load("@rules_rust//tools/rust_analyzer:deps.bzl", "rust_analyzer_dependencies")
44
load("//deps/rust/crates:crates.bzl", "crate_repositories")
55

6-
RUST_STABLE_VERSION = "1.86.0" # LLVM 19
6+
RUST_STABLE_VERSION = "1.90.0" # LLVM 20
77

8-
RUST_NIGHTLY_VERSION = "nightly/2025-02-20"
8+
RUST_NIGHTLY_VERSION = "nightly/2025-09-18"
99

1010
# List of additional triples to be configured on top of the local platform triple
1111
RUST_TARGET_TRIPLES = [
@@ -33,6 +33,7 @@ def rust_toolchains():
3333
RUST_STABLE_VERSION,
3434
RUST_NIGHTLY_VERSION,
3535
],
36+
allocator_library = "@workerd//deps/rust:allocator",
3637
)
3738

3839
for t in RUST_TARGET_TRIPLES:

build/wd_cc_benchmark.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def wd_cc_benchmark(
2828
visibility = visibility,
2929
deps = deps + [
3030
"@workerd-google-benchmark//:benchmark_main",
31-
"//deps/rust:runtime",
3231
"//src/workerd/tests:bench-tools",
3332
],
3433
# use the same malloc we use for server

build/wd_cc_binary.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ def wd_cc_binary(
3030
"//conditions:default": [],
3131
}),
3232
visibility = visibility,
33-
deps = deps + [
34-
"//deps/rust:runtime",
35-
],
33+
deps = deps,
3634
**kwargs
3735
)
3836

build/wd_rust_crate.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def wd_rust_crate(
111111
name = name,
112112
crate_name = crate_name,
113113
srcs = srcs,
114-
deps = deps,
114+
deps = deps + ["@workerd//deps/rust:runtime"],
115115
visibility = visibility,
116116
data = data,
117117
proc_macro_deps = proc_macro_deps,

deps/rust/BUILD.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ cc_library(
8888
"//conditions:default": [],
8989
}),
9090
visibility = ["//visibility:public"],
91-
deps = select({
92-
"@platforms//os:windows": [":empty_lib"],
93-
"//conditions:default": [],
94-
}),
91+
deps = [":empty_lib"],
9592
)
9693

9794
write_file(
@@ -111,3 +108,8 @@ rust_static_library(
111108
stamp = -1, # default to bazel --stamp flag
112109
tags = ["manual"],
113110
)
111+
112+
cc_library(
113+
name = "allocator",
114+
visibility = ["//visibility:public"],
115+
)

src/rust/cxx-integration-test/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//! Non-production crate to help test various aspects of rust/c++ integration.
22
33
use std::io::Error;
4-
use std::io::ErrorKind;
54
use std::pin::Pin;
65
use std::time::Duration;
76

@@ -100,7 +99,7 @@ fn result_ok() -> Result<i32> {
10099
}
101100

102101
fn result_error() -> Result<i32> {
103-
Err(Error::new(ErrorKind::Other, "test error"))
102+
Err(Error::other("test error"))
104103
}
105104

106105
fn log_every_level() {

src/rust/kj/http.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::io::AsyncIoStream;
1414
#[cxx::bridge(namespace = "kj::rust")]
1515
#[expect(clippy::missing_panics_doc)]
1616
#[expect(clippy::missing_safety_doc)]
17-
#[expect(clippy::needless_lifetimes)]
17+
#[expect(clippy::elidable_lifetime_names)]
1818
pub mod ffi {
1919
unsafe extern "C++" {
2020
include!("workerd/rust/kj/ffi.h");

src/workerd/server/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ wd_cc_library(
182182
":fallback-service",
183183
":workerd-api",
184184
":workerd_capnp",
185-
"//deps/rust:runtime",
186185
"//src/cloudflare",
187186
"//src/node",
188187
"//src/pyodide:pyodide_static",

0 commit comments

Comments
 (0)