Skip to content

Commit daaa466

Browse files
authored
Remove the -test suffix from normalize directives (#2172)
1 parent f756d61 commit daaa466

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Diff for: src/tests/directives.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ for more details.
9696
| `check-stdout` | Check `stdout` against `error-pattern`s from running test binary[^check_stdout] | `ui`, `crashes`, `incremental` | N/A |
9797
| `normalize-stderr-32bit` | Normalize actual stderr (for 32-bit platforms) with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
9898
| `normalize-stderr-64bit` | Normalize actual stderr (for 64-bit platforms) with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
99-
| `normalize-stderr-test` | Normalize actual stderr with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
100-
| `normalize-stdout-test` | Normalize actual stdout with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
99+
| `normalize-stderr` | Normalize actual stderr with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
100+
| `normalize-stdout` | Normalize actual stdout with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
101101
| `dont-check-compiler-stderr` | Don't check actual compiler stderr vs stderr snapshot | `ui` | N/A |
102102
| `dont-check-compiler-stdout` | Don't check actual compiler stdout vs stdout snapshot | `ui` | N/A |
103103
| `run-rustfix` | Apply all suggestions via `rustfix`, snapshot fixed output, and check fixed output builds | `ui` | N/A |

Diff for: src/tests/ui.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ Sometimes these built-in normalizations are not enough. In such cases, you may
140140
provide custom normalization rules using `normalize-*` directives, e.g.
141141

142142
```rust,ignore
143-
//@ normalize-stdout-test: "foo" -> "bar"
143+
//@ normalize-stdout: "foo" -> "bar"
144+
//@ normalize-stderr: "foo" -> "bar"
144145
//@ normalize-stderr-32bit: "fn\(\) \(32 bits\)" -> "fn\(\) \($$PTR bits\)"
145146
//@ normalize-stderr-64bit: "fn\(\) \(64 bits\)" -> "fn\(\) \($$PTR bits\)"
146147
```
@@ -167,11 +168,6 @@ usage example.
167168
[mrs]: https://github.com/rust-lang/rust/blob/master/tests/ui/transmute/main.rs
168169
[`main.stderr`]: https://github.com/rust-lang/rust/blob/master/tests/ui/transmute/main.stderr
169170

170-
Besides `normalize-stderr-32bit` and `-64bit`, one may use any target
171-
information or stage supported by [`ignore-X`](directives.md#ignoring-tests) here
172-
as well (e.g. `normalize-stderr-windows` or simply `normalize-stderr-test` for
173-
unconditional replacement).
174-
175171
## Error annotations
176172

177173
Error annotations specify the errors that the compiler is expected to emit. They

0 commit comments

Comments
 (0)