Skip to content

Commit b0abb4d

Browse files
committed
Auto merge of #155416 - Zalathar:rollup-D1EWnrR, r=Zalathar
Rollup of 19 pull requests Successful merges: - rust-lang/rust#141633 (Suggest to bind `self.x` to `x` when field `x` may be in format string) - rust-lang/rust#152980 (c-variadic: fix implementation on `avr`) - rust-lang/rust#154491 (Extend `core::char`'s documentation of casing issues (and fix a rustdoc bug)) - rust-lang/rust#155318 (Use mutable pointers for Unix path buffers) - rust-lang/rust#155335 (Bump bootstrap to 1.96 beta) - rust-lang/rust#155354 (Remove AttributeSafety from BUILTIN_ATTRIBUTES) - rust-lang/rust#154970 (rustdoc: preserve `doc(cfg)` on locally re-exported type aliases) - rust-lang/rust#155095 (changed the information provided by (mut x) to mut x (Fix 155030)) - rust-lang/rust#155305 (Make `convert_while_ascii` unsafe) - rust-lang/rust#155358 (ImproperCTypes: Move erasing_region_normalisation into helper function) - rust-lang/rust#155377 (tests/debuginfo/basic-stepping.rs: Remove FIXME related to ZSTs) - rust-lang/rust#155383 (Rearrange `rustc_ast_pretty`) - rust-lang/rust#155384 (triagebot: notify on diagnostic attribute changes) - rust-lang/rust#155386 (Use `box_new` diagnostic item for Box::new suggestions) - rust-lang/rust#155391 (Small refactor of `QueryJob::latch` method) - rust-lang/rust#155395 (Tweak how the "copy path" rustdoc button works to allow some accessibility tool to work with rustdoc) - rust-lang/rust#155396 (`as_ref_unchecked` docs link fix) - rust-lang/rust#155411 (compiletest: Remove the `//@ should-ice` directive) - rust-lang/rust#155413 (fix: typo in `std::fs::hard_link` documentation)
2 parents 2c85c08 + e3264a0 commit b0abb4d

2 files changed

Lines changed: 1 addition & 8 deletions

File tree

src/tests/compiletest.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ substring must not appear anywhere in the compiler output.
190190
This can be useful to ensure certain errors do not appear, but this can be fragile as error messages
191191
change over time, and a test may no longer be checking the right thing but will still pass.
192192

193-
`cfail` tests support the `should-ice` directive to specify that a test should
194-
cause an Internal Compiler Error (ICE).
195-
This is a highly specialized directive
196-
to check that the incremental cache continues to work after an ICE.
197-
198193
Incremental tests may use the attribute `#[rustc_clean(...)]` attribute.
199194
This attribute compares the fingerprint from the current compilation session with the previous one.
200195
The first revision should never have an active `rustc_clean` attribute, since it will always be dirty.

src/tests/directives.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ See [Controlling pass/fail expectations](ui.md#controlling-passfail-expectations
8080
| `run-fail-or-crash` | Program must `run-fail` or `run-crash` | `ui` | N/A |
8181
| `ignore-pass` | Ignore `--pass` flag | `ui`, `crashes`, `codegen`, `incremental` | N/A |
8282
| `dont-check-failure-status` | Don't check exact failure status (i.e. `1`) | `ui`, `incremental` | N/A |
83-
| `failure-status` | Check | `ui`, `crashes` | Any `u16` |
84-
| `should-ice` | Check failure status is `101` | `coverage`, `incremental` | N/A |
83+
| `failure-status` | On failure, the compiler must exit with this status code. To expect an ICE, use `//@ failure-status: 101`. | `ui`, `crashes`, `incremental` | Any `u16` |
8584
| `should-fail` | Compiletest self-test | All | N/A |
8685

8786
### Controlling output snapshots and normalizations
@@ -318,7 +317,6 @@ See [Pretty-printer](compiletest.md#pretty-printer-tests).
318317
- [`revisions`](compiletest.md#revisions) — compile multiple times
319318
-[`forbid-output`](compiletest.md#incremental-tests) — incremental cfail rejects
320319
output pattern
321-
- [`should-ice`](compiletest.md#incremental-tests) — incremental cfail should ICE
322320
- [`reference`] — an annotation linking to a rule in the reference
323321
- `disable-gdb-pretty-printers` — disable gdb pretty printers for debuginfo tests
324322

0 commit comments

Comments
 (0)