Skip to content

Commit cd593d4

Browse files
committed
Auto merge of #139552 - matthiaskrgr:rollup-b194mk8, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #139494 (Restrict some queries by def-kind more) - #139496 (Revert r-a changes of rust-lang/rust#139455) - #139506 (add missing word in doc comment (part 2)) - #139515 (Improve presentation of closure signature mismatch from `Fn` trait goal) - #139520 (compiletest maintenance: sort deps and drop dep on `anyhow`) - #139523 (Rustc dev guide subtree update) - #139526 (Fix deprecation note for std::intrinsics) - #139528 (compiletest: Remove the `--logfile` flag) - #139541 (Instantiate higher-ranked transmute goal w/ placeholders before emitting sub-obligations) - #139547 (Update library tracking issue template to set S-tracking-unimplemented) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 372b40b + b2148a8 commit cd593d4

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

book.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[book]
22
title = "Rust Compiler Development Guide"
3-
author = "The Rust Project Developers"
3+
authors = ["The Rust Project Developers"]
44
description = "A guide to developing the Rust compiler (rustc)"
55

66
[build]

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ae9173d7dd4a31806c950c90dcc331f1508b4d17
1+
25a615bf829b9f6d6f22da537e3851043f92e5f2

src/backend/libs-and-metadata.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ See [`compute_hir_hash`] for where the hash is actually computed.
110110

111111
[SVH]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_data_structures/svh/struct.Svh.html
112112
[incremental compilation]: ../queries/incremental-compilation.md
113-
[`compute_hir_hash`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast_lowering/struct.LoweringContext.html#method.compute_hir_hash
113+
[`compute_hir_hash`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast_lowering/fn.compute_hir_hash.html
114114

115115
### Stable Crate Id
116116

src/rustdoc.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ does is call the `main()` that's in this crate's `lib.rs`, though.)
9090
are in `tests/rustdoc-gui`. These use a [NodeJS tool called
9191
browser-UI-test](https://github.com/GuillaumeGomez/browser-UI-test/) that uses
9292
puppeteer to run tests in a headless browser and check rendering and
93-
interactivity.
93+
interactivity. For information on how to write this form of test,
94+
see [`tests/rustdoc-gui/README.md`][rustdoc-gui-readme]
95+
as well as [the description of the `.goml` format][goml-script]
9496
* Additionally, JavaScript type annotations are written using [TypeScript-flavored JSDoc]
9597
comments and an external d.ts file. The code itself is plain, valid JavaScript; we only
9698
use tsc as a linter.
@@ -100,6 +102,8 @@ does is call the `main()` that's in this crate's `lib.rs`, though.)
100102
[These tests have several extra directives available to them](./rustdoc-internals/rustdoc-test-suite.md).
101103

102104
[TypeScript-flavored JSDoc]: https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html
105+
[rustdoc-gui-readme]: https://github.com/rust-lang/rust/blob/master/tests/rustdoc-gui/README.md
106+
[goml-script]: https://github.com/GuillaumeGomez/browser-UI-test/blob/master/goml-script.md
103107

104108
## Constraints
105109

src/tests/directives.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
FIXME(jieyouxu) completely revise this chapter.
77
-->
88

9-
Directives are special comments that tell compiletest how to build and interpret a test. They must appear before the Rust source in the test. They may also appear in `rmake.rs` [run-make tests](compiletest.md#run-make-tests).
9+
Directives are special comments that tell compiletest how to build and interpret a test.
10+
They may also appear in `rmake.rs` [run-make tests](compiletest.md#run-make-tests).
1011

1112
They are normally put after the short comment that explains the point of this
1213
test. Compiletest test suites use `//@` to signal that a comment is a directive.

src/tests/ui.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,9 @@ But for strict testing, try to use the `ERROR` annotation as much as possible,
335335
including `//~?` annotations for diagnostics without span.
336336
For compile time diagnostics `error-pattern` should very rarely be necessary.
337337

338-
Per-line annotations (`//~`) are still checked in tests using `error-pattern`,
339-
to opt out of these checks in exceptional cases use `//@ compile-flags: --error-format=human`.
338+
Per-line annotations (`//~`) are still checked in tests using `error-pattern`.
339+
To opt out of these checks, use `//@ compile-flags: --error-format=human`.
340+
Do that only in exceptional cases.
340341

341342
### Error levels
342343

0 commit comments

Comments
 (0)