Skip to content

Commit 98847b9

Browse files
committed
Downgrade rust version to 1.80
Due to a change in how wasm code gen is done, a bug in the workers runtime has surfaced which blocks use of rust versions above 1.80
1 parent 974dd0c commit 98847b9

File tree

28 files changed

+59
-45
lines changed

28 files changed

+59
-45
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ license = "BSD-3-Clause"
1919
readme = "README.md"
2020
homepage = "https://github.com/cloudflare/daphne"
2121
repository = "https://github.com/cloudflare/daphne"
22+
rust-version = "1.80"
2223

2324
[profile.release]
2425
opt-level = "s"

crates/dapf/src/http_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub struct HttpClient {
1313
inner: HttpClientInner,
1414
}
1515

16-
#[expect(clippy::large_enum_variant)]
16+
#[allow(clippy::large_enum_variant)]
1717
enum HttpClientInner {
1818
/// Never reuse the same reqwest client for two different http requests. Usefull for specific
1919
/// debugging or load testing scenarios.

crates/dapf/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ enum HpkeAction {
214214
}
215215

216216
#[derive(Debug, Subcommand)]
217-
#[expect(clippy::large_enum_variant)]
217+
#[allow(clippy::large_enum_variant)]
218218
enum TestAction {
219219
/// Add an hpke config to a test-utils enabled `daphne-server`.
220220
AddHpkeConfig {

crates/daphne-server/docker/example-service.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2024 Cloudflare, Inc. All rights reserved.
22
# SPDX-License-Identifier: BSD-3-Clause
33

4-
FROM rust:1.82-bookworm AS builder
4+
FROM rust:1.80-bookworm AS builder
55

66
RUN apt update && \
77
apt install -y \

crates/daphne-server/src/storage_proxy_connection/kv/cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl Cache {
7676
);
7777
}
7878

79-
#[expect(dead_code)]
79+
#[allow(dead_code)]
8080
pub fn delete<P>(&mut self, key: &str) -> CacheResult<P::Value>
8181
where
8282
P: KvPrefix,

crates/daphne-server/src/storage_proxy_connection/kv/request_coalescer.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,10 @@ mod test {
487487
Ok(Some(Marc::new(fut.await)))
488488
})
489489
.await;
490-
let Ok(s) = result.map(|opt| *opt.unwrap()).map_err(|e| *e);
491-
s
490+
match result.map(|opt| *opt.unwrap()).map_err(|e| *e) {
491+
Ok(s) => s,
492+
Err(infallible) => match infallible {},
493+
}
492494
}
493495
}
494496
}

crates/daphne-server/src/storage_proxy_connection/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<'h> Do<'h> {
4242
}
4343
}
4444

45-
#[expect(dead_code)]
45+
#[allow(dead_code)]
4646
pub fn with_retry(self) -> Self {
4747
Self {
4848
retry: true,
@@ -126,7 +126,7 @@ impl Do<'_> {
126126
}
127127
}
128128

129-
#[expect(dead_code)]
129+
#[allow(dead_code)]
130130
pub fn request_with_id<B: DurableMethod + Copy>(
131131
&self,
132132
path: B,

crates/daphne-server/tests/e2e/e2e.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ async fn leader_collect_taskprov_ok(version: DapVersion) {
14371437
.poll_collection_url_using_token(client, &collect_uri, DAP_TASKPROV_COLLECTOR_TOKEN)
14381438
.await
14391439
.unwrap();
1440-
#[expect(clippy::format_in_format_args)]
1440+
#[allow(clippy::format_in_format_args)]
14411441
{
14421442
assert_eq!(
14431443
resp.status(),

crates/daphne-server/tests/e2e/test_runner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ impl TestRunner {
419419
Ok(())
420420
}
421421

422-
#[expect(clippy::too_many_arguments)]
422+
#[allow(clippy::too_many_arguments)]
423423
pub async fn leader_request_expect_abort(
424424
&self,
425425
client: &reqwest::Client,

crates/daphne-worker-test/docker/aggregator.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2025 Cloudflare, Inc. All rights reserved.
22
# SPDX-License-Identifier: BSD-3-Clause
33

4-
FROM rust:1.83-bookworm AS builder
4+
FROM rust:1.80-bookworm AS builder
55
RUN apt update && apt install -y capnproto clang cmake
66

77
# Pre-install worker-build and Rust's wasm32 target to speed up our custom build command
88
RUN rustup target add wasm32-unknown-unknown
9-
RUN cargo install --git https://github.com/cloudflare/workers-rs
9+
RUN cargo install worker-build@0.1.1 --locked
1010

1111
# Build the worker.
1212
WORKDIR /tmp/dap_test

0 commit comments

Comments
 (0)