diff options
| author | bors <bors@rust-lang.org> | 2023-03-28 07:02:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-28 07:02:21 +0000 |
| commit | f418859d8a464fb9ff5b5b1a4459d35fb8cfab1d (patch) | |
| tree | ba5671b3f24a587b97680fab2e4f3156e6dc38a1 /src | |
| parent | cbc064b341be231403d181402a786cce7f1c73f1 (diff) | |
| parent | a69496002cd08d73fe1c901f2f179ca0a87fefb8 (diff) | |
| download | rust-f418859d8a464fb9ff5b5b1a4459d35fb8cfab1d.tar.gz rust-f418859d8a464fb9ff5b5b1a4459d35fb8cfab1d.zip | |
Auto merge of #109690 - matthiaskrgr:rollup-6p5m0es, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #108548 (Clarify the 'use a constant in a pattern' error message) - #109565 (Improve documentation for E0223) - #109661 (Fix LVI test post LLVM 16 update) - #109667 (Always set `RUSTC_BOOTSTRAP` with `x doc`) - #109669 (Update books) - #109678 (Don't shadow the `dep_node` var in `incremental_verify_ich_failed`) - #109682 (Add `#[inline]` to CStr trait implementations) - #109685 (Make doc comment a little bit more accurate) - #109687 (Document the heuristics IsTerminal uses on Windows) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/doc.rs | 9 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 | ||||
| -rw-r--r-- | src/tools/clippy/tests/ui/crashes/ice-6254.stderr | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 36fdd4abf4f..be43affa404 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -1027,10 +1027,11 @@ impl Step for RustcBook { if self.validate { cmd.arg("--validate"); } - if !builder.unstable_features() { - // We need to validate nightly features, even on the stable channel. - cmd.env("RUSTC_BOOTSTRAP", "1"); - } + // We need to validate nightly features, even on the stable channel. + // Set this unconditionally as the stage0 compiler may be being used to + // document. + cmd.env("RUSTC_BOOTSTRAP", "1"); + // If the lib directories are in an unusual location (changed in // config.toml), then this needs to explicitly update the dylib search // path. diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 1f3e4cd4fd88b5b5d45feb86a11b6d2f93e5a97 +Subproject b5f7500fc40775096c2bbd204eae096612cf904 diff --git a/src/doc/reference b/src/doc/reference -Subproject 24c87f6663aed55b05d2cc286878f28f2191882 +Subproject 3c47807a3131b3c7cacb508f52632078d253cd0 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject af0998b7473839ca75563ba3d3e7fd0160bef23 +Subproject cfbfd648ce33926c3490f24de9a5b56cce404b8 diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject b1b6d693cd1461e53de4132c1b183ace31cd36e +Subproject d08baa166b463537229eeb737c4ccadabd83cf7 diff --git a/src/tools/clippy/tests/ui/crashes/ice-6254.stderr b/src/tools/clippy/tests/ui/crashes/ice-6254.stderr index 22d82a30c6a..263c27d3d64 100644 --- a/src/tools/clippy/tests/ui/crashes/ice-6254.stderr +++ b/src/tools/clippy/tests/ui/crashes/ice-6254.stderr @@ -6,6 +6,8 @@ LL | FOO_REF_REF => {}, | = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #62411 <https://github.com/rust-lang/rust/issues/62411> + = note: the traits must be derived, manual `impl`s are not sufficient + = note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details = note: `-D indirect-structural-match` implied by `-D warnings` error: aborting due to previous error |
