From 233d2d3b51c26910170992860851a0b82c6d844e Mon Sep 17 00:00:00 2001 From: Zalathar Date: Wed, 13 May 2026 16:32:07 +1000 Subject: [PATCH 1/3] Rename `//@ ignore-pass` to `//@ no-pass-override` By convention, compiletest directives starting with `ignore-*` normally cause the test itself to be skipped under certain conditions. The `//@ ignore-pass` directive was the only exception to that convention. The new name should hopefully do a better job of communicating its effect, which is to cause the `--pass` flag to not override the test's `build-pass` or `run-pass` directive. The `//@ no-pass-override` directive is mainly useful for tests that expect warnings produced during codegen. --- src/tests/directives.md | 2 +- src/tests/running.md | 2 +- src/tests/ui.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/directives.md b/src/tests/directives.md index 34d25b1d6d..87d6648975 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -78,7 +78,7 @@ See [Controlling pass/fail expectations](ui.md#controlling-passfail-expectations | `run-fail` | Program must exit with code `1..=127` | `ui` | N/A | | `run-crash` | Program must crash | `ui` | N/A | | `run-fail-or-crash` | Program must `run-fail` or `run-crash` | `ui` | N/A | -| `ignore-pass` | Ignore `--pass` flag | `ui` | N/A | +| `no-pass-override` | Ignore `--pass` flag | `ui` | N/A | | `dont-check-failure-status` | Don't check exact failure status (i.e. `1`) | `ui`, `incremental` | N/A | | `failure-status` | On failure, the compiler must exit with this status code. To expect an ICE, use `//@ failure-status: 101`. | `ui`, `incremental` | Any `u16` | | `should-fail` | Compiletest self-test | All | N/A | diff --git a/src/tests/running.md b/src/tests/running.md index 74bcc01e28..0ee670277a 100644 --- a/src/tests/running.md +++ b/src/tests/running.md @@ -202,7 +202,7 @@ There are a few options for running tests: Pass UI tests now have three modes, `check-pass`, `build-pass` and `run-pass`. When `--pass $mode` is passed, these tests will be forced to run under the given -`$mode` unless the directive `//@ ignore-pass` exists in the test file. +`$mode` unless the directive `//@ no-pass-override` exists in the test file. For example, you can run all the tests in `tests/ui` as `check-pass`: ```text diff --git a/src/tests/ui.md b/src/tests/ui.md index d90240af25..1e74a3de40 100644 --- a/src/tests/ui.md +++ b/src/tests/ui.md @@ -492,7 +492,7 @@ Using `--pass check` can run the UI test suite much faster (roughly twice as fast on my system), though obviously not exercising as much. -The `ignore-pass` directive can be used to ignore the `--pass` CLI flag if the +The `no-pass-override` directive can be used to ignore the `--pass` CLI flag if the test won't work properly with that override. From efe68e1926890fad4b52d31e237e750672092cc5 Mon Sep 17 00:00:00 2001 From: "Mark Z. Ding" Date: Thu, 14 May 2026 13:54:07 -0400 Subject: [PATCH 2/3] ignore some musttail tests on unsupported LLVM targets --- src/tests/directives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/directives.md b/src/tests/directives.md index 34d25b1d6d..4ae5a4144f 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -133,7 +133,7 @@ means the test won't be compiled or run. Some examples of `X` in `ignore-X` or `only-X`: - A full target triple: `aarch64-apple-ios` -- Architecture: `aarch64`, `arm`, `mips`, `wasm32`, `x86_64`, `x86`, +- Architecture: `aarch64`, `arm`, `csky`, `mips`, `mips64`, `wasm32`, `x86_64`, `x86`, ... - OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`, ... From 758fd1ff74193a17c8d264ac776ecacf2f906dc6 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Mon, 18 May 2026 05:32:27 +0000 Subject: [PATCH 3/3] Prepare for merging from rust-lang/rust This updates the rust-version file to a31c27a887b40df16ab9dfb8c9f7924636092509. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index d33dd7b83a..6884c82e9e 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -f2b291d902bfde7d7f209fc3a64908134bcef201 +a31c27a887b40df16ab9dfb8c9f7924636092509