| commit | c8fb0b5be2c95d90036d78a4cffa483005c5daee | [log] [tgz] |
|---|---|---|
| author | bors <bors@rust-lang.org> | Fri Jul 23 15:14:52 2021 +0000 |
| committer | bors <bors@rust-lang.org> | Fri Jul 23 15:14:52 2021 +0000 |
| tree | 56e0c5e28a7fc1af673eda3db36843a9d2b5d563 | |
| parent | b95932895bf1da401db90ab25bb38e01e5bc4393 [diff] | |
| parent | 741e208a067581cfe21f6f6b1ff399a7aa6a6630 [diff] |
Auto merge of #87393 - michaelwoerister:backport-85834-and-86368, r=Mark-Simulacrum Backport #85834 and #86368 As per discussion in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/backport.20.2386368, backporting #85834 too seems like the safest option for cleanly backporting #86368. r? `@Mark-Simulacrum`