From 59ca0a7e2d00a53745e1df91c489c56747b07cc1 Mon Sep 17 00:00:00 2001 From: Zalathar Date: Sat, 15 Nov 2025 20:26:56 +1100 Subject: [PATCH 1/2] Don't apply "emscripten" directives to `wasm32-unknown-unknown` --- src/tests/directives.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tests/directives.md b/src/tests/directives.md index b6273c66d..5d626e3c9 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -141,8 +141,7 @@ Some examples of `X` in `ignore-X` or `only-X`: - OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`, ... - Environment (fourth word of the target triple): `gnu`, `msvc`, `musl` -- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. `emscripten` also - matches that target as well as the emscripten targets. +- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. - Pointer width: `32bit`, `64bit` - Endianness: `endian-big` - Stage: `stage1`, `stage2` From 2c7c572bee91d60ad486fbead7fe891c22288af9 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Mon, 17 Nov 2025 04:16:56 +0000 Subject: [PATCH 2/2] Prepare for merging from rust-lang/rust This updates the rust-version file to 69d4d5fc0e4db60272aac85ef27ecccef5764f3a. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 04d41c96f..25bb5e923 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -8401398e1f14a24670ee1a3203713dc2f0f8b3a8 +69d4d5fc0e4db60272aac85ef27ecccef5764f3a