Commit 553bb9b
committed
Auto merge of #152739 - Zalathar:rollup-8qaJ8F2, r=Zalathar
Rollup of 11 pull requests
Successful merges:
- rust-lang/rust#152700 (miri subtree update)
- rust-lang/rust#152715 (`rust-analyzer` subtree update)
- rust-lang/rust#151783 (Implement RFC 3678: Final trait methods)
- rust-lang/rust#152512 (core: Implement feature `float_exact_integer_constants`)
- rust-lang/rust#152661 (Avoid ICE in From/TryFrom diagnostic under -Znext-solver)
- rust-lang/rust#152703 (Remove `rustc_query_system`)
- rust-lang/rust#152206 (misc doc improvements)
- rust-lang/rust#152664 (Fix mis-constructed `file_span` when generating scraped examples)
- rust-lang/rust#152698 (Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked`)
- rust-lang/rust#152727 (`probe_op` silence ambiguity errors if tainted)
- rust-lang/rust#152728 (Port #![default_lib_allocator] to the new attribute parser)1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
| 181 | + | |
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
| |||
534 | 534 | | |
535 | 535 | | |
536 | 536 | | |
537 | | - | |
| 537 | + | |
0 commit comments