Commit e187c30
committed
Auto merge of #152627 - JonathanBrouwer:rollup-wjHXhK0, r=JonathanBrouwer
Rollup of 8 pull requests
Successful merges:
- rust-lang/rust#152618 (stdarch subtree update)
- rust-lang/rust#152001 (mGCA: Validate const literal against expected type)
- rust-lang/rust#152120 (Don't ICE on layout error in vtable computation)
- rust-lang/rust#152531 (`proc_macro::bridge`: simplify `ExecutionStrategy` and `DispatcherTrait`)
- rust-lang/rust#152577 (Port #[rustc_proc_macro_decls] to the new attribute parser.)
- rust-lang/rust#152570 (Port #[rustc_test_marker] to the attribute parser)
- rust-lang/rust#152590 (DepGraphQuery: correctly skip adding edges with not-yet-added nodes)
- rust-lang/rust#152612 (Rename `inline_fluent!` to `msg!`)1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
0 commit comments