Skip to content

Commit d28509e

Browse files
committed
Auto merge of #148992 - Zalathar:rollup-c1aqvox, r=Zalathar
Rollup of 3 pull requests Successful merges: - rust-lang/rust#145954 (stabilize extern_system_varargs) - rust-lang/rust#148962 (fix(span): track unnormalized source len for dep-info) - rust-lang/rust#148969 (compiletest: Don't apply "emscripten" directives to `wasm32-unknown-unknown`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cd1eb37 + 9026607 commit d28509e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/tests/directives.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ Some examples of `X` in `ignore-X` or `only-X`:
141141
- OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`,
142142
...
143143
- Environment (fourth word of the target triple): `gnu`, `msvc`, `musl`
144-
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. `emscripten` also
145-
matches that target as well as the emscripten targets.
144+
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`.
146145
- Pointer width: `32bit`, `64bit`
147146
- Endianness: `endian-big`
148147
- Stage: `stage1`, `stage2`

0 commit comments

Comments
 (0)