diff options
| author | bors <bors@rust-lang.org> | 2021-12-23 19:43:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-23 19:43:04 +0000 |
| commit | c09a9529c51cde41c1101e56049d418edb07bf71 (patch) | |
| tree | 0ccbb239ed96ad77fa9487d16b5931ee788213db /src | |
| parent | 77497c74f9268ccf91d7b4c17f23bf07117d7433 (diff) | |
| parent | 996fb28298157ebccdff0cb2718289de3d775ad3 (diff) | |
| download | rust-c09a9529c51cde41c1101e56049d418edb07bf71.tar.gz rust-c09a9529c51cde41c1101e56049d418edb07bf71.zip | |
Auto merge of #92232 - matthiaskrgr:rollup-eqdac7z, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #90625 (Add `UnwindSafe` to `Once`) - #92121 (disable test with self-referential generator on Miri) - #92166 (Fixed a small typo in ui test comments) - #92203 (Store a `DefId` instead of an `AdtDef` in `AggregateKind::Adt`) - #92231 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rustc-dev-guide | 0 | ||||
| -rw-r--r-- | src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs | 2 |
5 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/book b/src/doc/book -Subproject 5f9358faeb1f46e19b8a23a21e79fd7fe150491 +Subproject 8a0bb3c96e71927b80fa2286d7a5a5f2547c6aa diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 49681ea4a9fa81173dbe9ffed74b4d4a35eae9e +Subproject c05c452b36358821bf4122f9c418674edd1d713 diff --git a/src/doc/reference b/src/doc/reference -Subproject 954f3d441ad880737a13e241108f791a4d2a38c +Subproject 06f9e61931bcf58b91dfe6c924057e42ce273ee diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide -Subproject a374e7d8bb6b79de45b92295d06b4ac0ef35bc0 +Subproject 9bf0028b557798ddd07a6f652e4d0c635d3d662 diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs b/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs index d30f4edd4b2..9bf0886084f 100644 --- a/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs +++ b/src/test/ui/rfc-2632-const-trait-impl/issue-92111.rs @@ -1,7 +1,7 @@ // Regression test for #92111. // // The issue was that we normalize trait bounds before caching -// results of selection. Checking that `impl NoDrop for S` requires +// results of selection. Checking that `impl Tr for S` requires // checking `S: !Drop` because it cannot overlap with the blanket // impl. Then we save the (unsatisfied) result from checking `S: Drop`. // Then the call to `a` checks whether `S: ~const Drop` but we normalize |