Commit 34aa5c2
committed
Auto merge of #137284 - matthiaskrgr:rollup-deuhk46, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #127793 (Added project-specific Zed IDE settings)
- #134995 (Stabilize const_slice_flatten)
- #136301 (Improve instant docs)
- #136347 (Add a bullet point to `std::fs::copy`)
- #136794 (Stabilize file_lock)
- #137094 (x86_win64 ABI: do not use xmm0 with softfloat ABI)
- #137227 (docs(dev): Update the feature-gate instructions)
- #137232 (Don't mention `FromResidual` on bad `?`)
- #137251 (coverage: Get hole spans from nested items without fully visiting them)
r? `@ghost`
`@rustbot` modify labels: rollup2 files changed
+12
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
157 | 167 | | |
158 | 168 | | |
159 | 169 | | |
| |||
381 | 391 | | |
382 | 392 | | |
383 | 393 | | |
| 394 | + | |
384 | 395 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
167 | 167 | | |
168 | 168 | | |
169 | 169 | | |
170 | | - | |
171 | | - | |
172 | | - | |
| 170 | + | |
173 | 171 | | |
174 | 172 | | |
175 | 173 | | |
| |||
0 commit comments