Commit dc44ae7
committed
Auto merge of #153116 - jhpratt:rollup-yjBVB1Y, r=jhpratt
Rollup of 13 pull requests
Successful merges:
- rust-lang/rust#148146 (CI: use alternative disks if available)
- rust-lang/rust#151771 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup)
- rust-lang/rust#153035 (rustc_target: callconv: powerpc64: Use llvm_abiname rather than target_abi for ABI determination)
- rust-lang/rust#153075 (mGCA: Lower negated literals directly and reject non-integer negations)
- rust-lang/rust#153078 (Remove `QuerySystemFns`)
- rust-lang/rust#153089 (interpret: avoid dummy spans in the stacktrace)
- rust-lang/rust#153111 (Refactor url_parts to return is_absolute instead of out param)
- rust-lang/rust#149978 (deprecate `Eq::assert_receiver_is_total_eq` and emit FCW on manual impls)
- rust-lang/rust#153029 (Rename `rustc::pass_by_value` lint as `rustc::disallowed_pass_by_ref`.)
- rust-lang/rust#153063 (`is_ty_must_use`: do not require a `span` argument)
- rust-lang/rust#153071 (Update books)
- rust-lang/rust#153092 (Remove redundant self usages)
- rust-lang/rust#153094 (Simplify `AppendOnlyVec` iterators)
Failed merges:
- rust-lang/rust#153091 (Migration of `LintDiagnostic` - part 4)1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
257 | 257 | | |
258 | 258 | | |
259 | 259 | | |
260 | | - | |
| 260 | + | |
261 | 261 | | |
262 | 262 | | |
263 | 263 | | |
| |||
633 | 633 | | |
634 | 634 | | |
635 | 635 | | |
636 | | - | |
| 636 | + | |
| 637 | + | |
637 | 638 | | |
638 | 639 | | |
639 | 640 | | |
| |||
0 commit comments