Commit 51f061e
committed
Auto merge of #151436 - jhpratt:rollup-Rp5KtGe, r=jhpratt
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#150436 (`c_variadic`: impl `va_copy` and `va_end` as Rust intrinsics)
- rust-lang/rust#151340 (Port `#[patchable_function_entry]` to attr parser)
- rust-lang/rust#151351 (Deduplicate diagnostics for const trait supertraits)
- rust-lang/rust#151424 (missing colon after the compile-flags directive)
- rust-lang/rust#151428 (Port variance attrs to attr parser.)
- rust-lang/rust#151429 (s390x: Support aligned stack datalayout)
Failed merges:
- rust-lang/rust#151343 (Port some crate level attrs to the attribute parser)
r? @ghost1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1506 | 1506 | | |
1507 | 1507 | | |
1508 | 1508 | | |
1509 | | - | |
| 1509 | + | |
1510 | 1510 | | |
1511 | 1511 | | |
1512 | 1512 | | |
| |||
0 commit comments