Skip to content

Commit cb9f42e

Browse files
authored
Merge pull request #4318 from rust-lang/rustup-2025-05-10
Automatic Rustup
2 parents d0279cf + f72760c commit cb9f42e

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

src/mir/dataflow.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ whereas this code uses [`ResultsCursor`]:
148148

149149
```rust,ignore
150150
let mut results = MyAnalysis::new()
151-
.into_engine(tcx, body, def_id)
152-
.iterate_to_fixpoint()
151+
.iterate_to_fixpoint(tcx, body, None);
153152
.into_results_cursor(body);
154153
155154
// Inspect the fixpoint state immediately before each `Drop` terminator.

src/tests/ci.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,16 @@ There are several use-cases for try builds:
135135
- Run a specific CI job (e.g. Windows tests) on a PR, to quickly test if it
136136
passes the test suite executed by that job.
137137

138-
You can select which CI jobs will
139-
be executed in the try build by adding lines containing `try-job:
140-
<job pattern>` to the PR description. All such specified jobs will be executed
141-
in the try build once the `@bors try` command is used on the PR. If no try
142-
jobs are specified in this way, the jobs defined in the `try` section of
143-
[`jobs.yml`] will be executed by default.
138+
By default, if you send a comment with `@bors try`, the jobs defined in the `try` section of
139+
[`jobs.yml`] will be executed. We call this mode a "fast try build". Such a try build
140+
will not execute any tests, and it will allow compilation warnings. It is useful when you want to
141+
get an optimized toolchain as fast as possible, for a crater run or performance benchmarks,
142+
even if it might not be working fully correctly.
143+
144+
If you want to run a custom CI job in a try build and make sure that it passes all tests and does
145+
not produce any compilation warnings, you can select CI jobs to be executed by adding lines
146+
containing `try-job: <job pattern>` to the PR description. All such specified jobs will be executed
147+
in the try build once the `@bors try` command is used on the PR.
144148

145149
Each pattern can either be an exact name of a job or a glob pattern that matches multiple jobs,
146150
for example `*msvc*` or `*-alt`. You can start at most 20 jobs in a single try build. When using

src/tests/ui.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ For checking runtime output, `//@ check-run-results` may be preferable.
344344

345345
Only use `error-pattern` if none of the above works.
346346

347-
Line annotations `//~` are still checked in tests using `error-pattern`.
348-
In exceptional cases, use `//@ compile-flags: --error-format=human` to opt out of these checks.
347+
Line annotations `//~` and `error-pattern` are compatible and can be used in the same test.
349348

350349
### Diagnostic kinds (error levels)
351350

@@ -356,9 +355,12 @@ The diagnostic kinds that you can have are:
356355
- `NOTE`
357356
- `HELP`
358357
- `SUGGESTION`
358+
- `RAW`
359359

360360
The `SUGGESTION` kind is used for specifying what the expected replacement text
361361
should be for a diagnostic suggestion.
362+
The `RAW` kind can be used for matching on lines from non-structured output sometimes emitted
363+
by the compiler instead of or in addition to structured json.
362364

363365
`ERROR` and `WARN` kinds are required to be exhaustively covered by line annotations
364366
`//~` by default.

0 commit comments

Comments
 (0)