Skip to content

Commit e1ec020

Browse files
committed
Auto merge of #143363 - jdonszelmann:rollup-7cv1kql, r=jdonszelmann
Rollup of 6 pull requests Successful merges: - rust-lang/rust#134006 (setup typos check in CI) - rust-lang/rust#142876 (Port `#[target_feature]` to new attribute parsing infrastructure) - rust-lang/rust#143038 (avoid suggesting traits from private dependencies) - rust-lang/rust#143083 (Fix rustdoc not correctly showing attributes on re-exports) - rust-lang/rust#143283 (document optional jobs) - rust-lang/rust#143329 (minicore: use core's `diagnostic::on_unimplemented` messages) Failed merges: - rust-lang/rust#143237 (Port `#[no_implicit_prelude]` to the new attribute parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a4d802b + 59bda96 commit e1ec020

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

src/tests/ci.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ for example `*msvc*` or `*-alt`. You can start at most 20 jobs in a single try b
148148
glob patterns, you might want to wrap them in backticks (`` ` ``) to avoid GitHub rendering
149149
the pattern as Markdown.
150150

151+
The job pattern needs to match one or more jobs defined in the `auto` or `optional` sections
152+
of [`jobs.yml`]:
153+
154+
- `auto` jobs are executed before a commit is merged into the `master` branch.
155+
- `optional` jobs are executed only when explicitly requested via a try build.
156+
They are typically used for tier 2 and tier 3 targets.
157+
151158
> **Using `try-job` PR description directives**
152159
>
153160
> 1. Identify which set of try-jobs you would like to exercise. You can

src/tests/minicore.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ If you find a `core` item to be missing from the [`minicore`] stub, consider
3939
adding it to the test auxiliary if it's likely to be used or is already needed
4040
by more than one test.
4141

42+
## Staying in sync with `core`
43+
44+
The `minicore` items must be kept up to date with `core`. For consistent
45+
diagnostic output between using `core` and `minicore`, any `diagnostic`
46+
attributes (e.g. `on_unimplemented`) should be replicated exactly in `minicore`.
47+
4248
## Example codegen test that uses `minicore`
4349

4450
```rust,no_run

0 commit comments

Comments
 (0)