Commit a70ae8a
authored
Auto merge of #150957 - matthiaskrgr:rollup-Cf6MsNU, r=matthiaskrgr
Rollup of 14 pull requests
Successful merges:
- rust-lang/rust#148941 (stabilize `Peekable::next_if_map` (`#![feature(peekable_next_if_map)]`))
- rust-lang/rust#150368 (adding Ordering enum to minicore.rs, importing minicore in "tests/assembly-llvm/rust-abi-arg-attr.rs" test file)
- rust-lang/rust#150668 (Unix implementation for stdio set/take/replace)
- rust-lang/rust#150743 (Reword the collect() docs)
- rust-lang/rust#150776 (Fix the connect_error test on FreeBSD 15+)
- rust-lang/rust#150781 (Use `rand` crate more idiomatically)
- rust-lang/rust#150812 (Bump `diesel` to the most recent commit in `cargotest`)
- rust-lang/rust#150862 (std: sys: fs: uefi: Implement File::flush)
- rust-lang/rust#150873 (Reenable GCC CI download)
- rust-lang/rust#150908 (llvm: Update `reliable_f16` configuration for LLVM22)
- rust-lang/rust#150918 (std: sys: fs: uefi: Implement File::seek)
- rust-lang/rust#150922 (Subscribe myself to attr parsing)
- rust-lang/rust#150930 (Remove special case for `AllowedTargets::CrateLevel`)
- rust-lang/rust#150942 (Port `#[rustc_has_incoherent_inherent_impls]` to attribute parser)
Failed merges:
- rust-lang/rust#150943 (Port `#[must_not_suspend]` to attribute parser)
r? @ghost4 files changed
Lines changed: 45 additions & 22 deletions
File tree
- src/shims
- tests
- fail-dep/libc/fs
- pass-dep/libc
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
252 | 261 | | |
253 | 262 | | |
254 | 263 | | |
| |||
279 | 288 | | |
280 | 289 | | |
281 | 290 | | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
282 | 300 | | |
283 | 301 | | |
284 | 302 | | |
| |||
289 | 307 | | |
290 | 308 | | |
291 | 309 | | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
292 | 319 | | |
293 | 320 | | |
294 | 321 | | |
| |||
436 | 463 | | |
437 | 464 | | |
438 | 465 | | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
439 | 475 | | |
440 | 476 | | |
441 | 477 | | |
| |||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| |||
579 | 580 | | |
580 | 581 | | |
581 | 582 | | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
0 commit comments