diff --git a/src/doc/rustc-dev-guide/src/tests/directives.md b/src/doc/rustc-dev-guide/src/tests/directives.md index 5d626e3c92d15..4226c1750ef2c 100644 --- a/src/doc/rustc-dev-guide/src/tests/directives.md +++ b/src/doc/rustc-dev-guide/src/tests/directives.md @@ -141,7 +141,6 @@ 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`. - Pointer width: `32bit`, `64bit` - Endianness: `endian-big` - Stage: `stage1`, `stage2` diff --git a/src/tools/compiletest/src/directives/cfg.rs b/src/tools/compiletest/src/directives/cfg.rs index 10795eee0fefa..1735866bf2cd6 100644 --- a/src/tools/compiletest/src/directives/cfg.rs +++ b/src/tools/compiletest/src/directives/cfg.rs @@ -147,14 +147,6 @@ fn parse_cfg_name_directive<'a>( message: "when the target family is {name}" } - // `wasm32-bare` is an alias to refer to just wasm32-unknown-unknown - // (in contrast to `wasm32` which also matches non-bare targets) - condition! { - name: "wasm32-bare", - condition: config.target == "wasm32-unknown-unknown", - message: "when the target is WASM" - } - condition! { name: "thumb", condition: config.target.starts_with("thumb"), diff --git a/src/tools/compiletest/src/directives/directive_names.rs b/src/tools/compiletest/src/directives/directive_names.rs index d2f5b3dba3dd7..8d1232a47596b 100644 --- a/src/tools/compiletest/src/directives/directive_names.rs +++ b/src/tools/compiletest/src/directives/directive_names.rs @@ -125,7 +125,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "ignore-wasi", "ignore-wasm", "ignore-wasm32", - "ignore-wasm32-bare", + "ignore-wasm32-unknown-unknown", "ignore-wasm64", "ignore-watchos", "ignore-windows", @@ -240,7 +240,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "only-unix", "only-visionos", "only-wasm32", - "only-wasm32-bare", + "only-wasm32-unknown-unknown", "only-wasm32-wasip1", "only-watchos", "only-windows", diff --git a/src/tools/compiletest/src/directives/tests.rs b/src/tools/compiletest/src/directives/tests.rs index 419bf0cfcd2f6..649dc85703419 100644 --- a/src/tools/compiletest/src/directives/tests.rs +++ b/src/tools/compiletest/src/directives/tests.rs @@ -710,18 +710,14 @@ fn wasm_special() { let ignores = [ ("wasm32-unknown-unknown", "emscripten", false), ("wasm32-unknown-unknown", "wasm32", true), - ("wasm32-unknown-unknown", "wasm32-bare", true), ("wasm32-unknown-unknown", "wasm64", false), ("wasm32-unknown-emscripten", "emscripten", true), ("wasm32-unknown-emscripten", "wasm32", true), - ("wasm32-unknown-emscripten", "wasm32-bare", false), ("wasm32-wasip1", "emscripten", false), ("wasm32-wasip1", "wasm32", true), - ("wasm32-wasip1", "wasm32-bare", false), ("wasm32-wasip1", "wasi", true), ("wasm64-unknown-unknown", "emscripten", false), ("wasm64-unknown-unknown", "wasm32", false), - ("wasm64-unknown-unknown", "wasm32-bare", false), ("wasm64-unknown-unknown", "wasm64", true), ]; for (target, pattern, ignore) in ignores { diff --git a/tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs b/tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs index ae281cb95da5f..3728ff3adf105 100644 --- a/tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs +++ b/tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs @@ -3,7 +3,7 @@ //@ ignore-apple slightly different policy on stack protection of arrays //@ ignore-msvc stack check code uses different function names //@ ignore-nvptx64 stack protector is not supported -//@ ignore-wasm32-bare +//@ ignore-wasm32-unknown-unknown //@ [all] compile-flags: -Z stack-protector=all //@ [strong] compile-flags: -Z stack-protector=strong //@ [basic] compile-flags: -Z stack-protector=basic diff --git a/tests/run-make/wasm-exceptions-nostd/rmake.rs b/tests/run-make/wasm-exceptions-nostd/rmake.rs index 720ee9909d2ab..e43d6bcd02b80 100644 --- a/tests/run-make/wasm-exceptions-nostd/rmake.rs +++ b/tests/run-make/wasm-exceptions-nostd/rmake.rs @@ -1,4 +1,4 @@ -//@ only-wasm32-bare +//@ only-wasm32-unknown-unknown use std::path::Path;