Skip to content

Commit b0dc282

Browse files
alexcrichtonbjorn3
andauthored
[43.0.0] A few more backports (#12795)
* Fix the x86 preset names (#12792) cg_clif needs them to match the target-cpu names of LLVM. * Add `Send` to `p2::WasiHttpHooks` trait (#12793) This means that the trait object `&mut dyn p2::WasiHttpHooks` is itself `Send` which is generally necessary for `async` operation. * Update release notes --------- Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
1 parent 51ec9db commit b0dc282

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Unreleased.
44

55
### Added
66

7-
* Wasmtime now supports the WASIp3 snapshot `0.3.0-rc-2026-02-09`.
7+
* Wasmtime now supports the WASIp3 snapshot `0.3.0-rc-2026-03-15`.
88
[#12557](https://github.com/bytecodealliance/wasmtime/pull/12557)
99

1010
* The number of frames captured in backtrace collection can now be configured.

cranelift/codegen/meta/src/isa/x86.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,19 +407,19 @@ pub(crate) fn define() -> TargetIsa {
407407

408408
// Generic
409409

410-
settings.add_preset("x86_64", "Generic x86-64 microarchitecture.", preset!());
410+
settings.add_preset("x86-64", "Generic x86-64 microarchitecture.", preset!());
411411
let x86_64_v2 = settings.add_preset(
412-
"x86_64_v2",
412+
"x86-64-v2",
413413
"Generic x86-64 (V2) microarchitecture.",
414414
preset!(sse42 && has_popcnt && has_cmpxchg16b),
415415
);
416416
let x86_64_v3 = settings.add_preset(
417-
"x86_64_v3",
417+
"x86-64-v3",
418418
"Generic x86-64 (V3) microarchitecture.",
419419
preset!(x86_64_v2 && has_bmi1 && has_bmi2 && has_fma && has_lzcnt && has_avx2),
420420
);
421421
settings.add_preset(
422-
"x86_64_v4",
422+
"x86-64-v4",
423423
"Generic x86-64 (V4) microarchitecture.",
424424
preset!(x86_64_v3 && has_avx512dq && has_avx512vl),
425425
);

crates/wasi-http/src/p2/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ pub use self::error::*;
282282
/// }
283283
/// }
284284
/// ```
285-
pub trait WasiHttpHooks {
285+
pub trait WasiHttpHooks: Send {
286286
/// Send an outgoing request.
287287
#[cfg(feature = "default-send-request")]
288288
fn send_request(

0 commit comments

Comments
 (0)