Commit 90c8a0a
committed
Auto merge of #156078 - JonathanBrouwer:rollup-WF8BsN3, r=JonathanBrouwer
Rollup of 9 pull requests
Successful merges:
- rust-lang/rust#156030 (Make stable hashing names consistent (part 1))
- rust-lang/rust#156020 (Improve source code for `librustdoc/visit_ast.rs`)
- rust-lang/rust#156021 (Clean up some traits)
- rust-lang/rust#156028 (Add a `Local::arg(i)` helper constructor)
- rust-lang/rust#156037 (Add AcceptContext::expect_no_args)
- rust-lang/rust#156040 (Add missing alias to mailmap)
- rust-lang/rust#156048 (Make `diverging_type_vars` a vec of `TyVid`)
- rust-lang/rust#156053 (Reuse CTFE MIR for constructors.)
- rust-lang/rust#156059 (compiler: Print valid `-Zmir-enable-passes` names if invalid name is used)
Failed merges:
- rust-lang/rust#155940 (refactor rustc_on_unimplemented's filtering)
- rust-lang/rust#156065 (Remove unused spans from AttributeKind)1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
264 | 264 | | |
265 | 265 | | |
266 | 266 | | |
267 | | - | |
| 267 | + | |
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
| |||
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
288 | | - | |
| 288 | + | |
289 | 289 | | |
290 | 290 | | |
291 | 291 | | |
| |||
0 commit comments