Skip to content

Commit 7addefa

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents 21a59f2 + 7665497 commit 7addefa

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

src/hir.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ defined in the map. By matching on this, you can find out what sort of
139139
node the `HirId` referred to and also get a pointer to the data
140140
itself. Often, you know what sort of node `n` is – e.g. if you know
141141
that `n` must be some HIR expression, you can do
142-
[`tcx.hir().expect_expr(n)`][expect_expr], which will extract and return the
142+
[`tcx.hir_expect_expr(n)`][expect_expr], which will extract and return the
143143
[`&hir::Expr`][Expr], panicking if `n` is not in fact an expression.
144144

145145
[find]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/hir/map/struct.Map.html#method.find
146146
[`Node`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/enum.Node.html
147-
[expect_expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/hir/map/struct.Map.html#method.expect_expr
147+
[expect_expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TyCtxt.html#method.expect_expr
148148
[Expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/struct.Expr.html
149149

150150
Finally, you can use the HIR map to find the parents of nodes, via

src/tests/ci.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,29 +133,37 @@ There are several use-cases for try builds:
133133
Again, a working compiler build is needed for this, which can be produced by
134134
the [dist-x86_64-linux] CI job.
135135
- Run a specific CI job (e.g. Windows tests) on a PR, to quickly test if it
136-
passes the test suite executed by that job. You can select which CI jobs will
137-
be executed in the try build by adding up to 10 lines containing `try-job:
138-
<name of job>` to the PR description. All such specified jobs will be executed
139-
in the try build once the `@bors try` command is used on the PR. If no try
140-
jobs are specified in this way, the jobs defined in the `try` section of
141-
[`jobs.yml`] will be executed by default.
136+
passes the test suite executed by that job.
137+
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.
144+
145+
Each pattern can either be an exact name of a job or a glob pattern that matches multiple jobs,
146+
for example `*msvc*` or `*-alt`. You can start at most 20 jobs in a single try build. When using
147+
glob patterns, you might want to wrap them in backticks (`` ` ``) to avoid GitHub rendering
148+
the pattern as Markdown.
142149

143150
> **Using `try-job` PR description directives**
144151
>
145-
> 1. Identify which set of try-jobs (max 10) you would like to exercise. You can
152+
> 1. Identify which set of try-jobs you would like to exercise. You can
146153
> find the name of the CI jobs in [`jobs.yml`].
147154
>
148-
> 2. Amend PR description to include (usually at the end of the PR description)
149-
> e.g.
155+
> 2. Amend PR description to include a set of patterns (usually at the end
156+
> of the PR description), for example:
150157
>
151158
> ```text
152159
> This PR fixes #123456.
153160
>
154161
> try-job: x86_64-msvc
155162
> try-job: test-various
163+
> try-job: `*-alt`
156164
> ```
157165
>
158-
> Each `try-job` directive must be on its own line.
166+
> Each `try-job` pattern must be on its own line.
159167
>
160168
> 3. Run the prescribed try jobs with `@bors try`. As aforementioned, this
161169
> requires the user to either (1) have `try` permissions or (2) be delegated

0 commit comments

Comments
 (0)