Skip to content

Rollup of 11 pull requests - #165937

Closed
JonathanBrouwer wants to merge 42 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-2EIVhVE
Closed

JonathanBrouwer wants to merge 42 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-2EIVhVE

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

GuillaumeGomez and others added 30 commits November 8, 2026 20:04
We also forward the existing `std::vec::from_elem_global` and
`std::vec::from_elem_in` to these new associated methods on `Vec`. The
module-level methods could potentially be removed in a follow-up.
Pass -march to the driver so the assembler targets the same CPU
…g fs functions to utilize with_native_path, and move exists to use with_native_path

* Implemented different with_native_path conversion methods, refactoring fs functions to utilize with_native_path, and move exists to use with_native_path
* Refactored Vexos' File::open and stat shared code in opening a file with a CStr through File::open_c
* Place path/motor.rs' and path/unsupported.rs' with_native_path implementation in path/unix_like.rs to remove unnecessary files
Enable `-Znext-solver` for `build_system` tests
This updates the rust-toolchain.toml file to nightly-2026-11-13 (8eb778d).
Use `trim_prefix` in bootstrap

The release notes for 1.100 reminded me that we can replace `a.strip_prefix(p).unwrap_or(a)` with `a.trim_prefix(p)`, for both strings and paths.

There should be no change in bootstrap behaviour.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Nov 13, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-bootstrap-stamp Area: bootstrap stamp logic A-filesystem Area: `std::fs` A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-path Area: `std::path` (note: `std::fs` is A-filesystem) A-slice-vec Area: `[T]` and `Vec<T>` S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Nov 13, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu,test-x86_64-gnu-llvm-22-3,test-aarch64-msvc-2

@rust-bors

rust-bors Bot commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2c3daad has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 13, 2026
@rust-bors

rust-bors Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

⌛ Trying commit 2c3daad with merge dca24eb…

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/43500001335

rust-bors Bot pushed a commit that referenced this pull request Nov 13, 2026
Rollup of 11 pull requests


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-msvc-1
try-job: test-aarch64-apple-1
try-job: test-aarch64-apple-2
try-job: test-x86_64-mingw-1
try-job: test-i686-msvc
try-job: test-armhf-gnu
try-job: test-x86_64-gnu-llvm-22-3
try-job: test-aarch64-msvc-2
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-various failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

error[E0308]: mismatched types
   --> library/std/src/sys/fs/uefi.rs:425:38
    |
425 |     let f = uefi_fs::File::from_path(path, file::MODE_READ, 0)?;
    |             ------------------------ ^^^^ expected `&Path`, found `PathBuf`
    |             |
    |             arguments to this function are incorrect
    |
note: associated function defined here
   --> library/std/src/sys/fs/uefi.rs:608:23
    |
607 |     impl File {
608 |         pub(crate) fn from_path(path: &Path, open_mode: u64, attr: u64) -> io::Result<Self> {
    |                       ^^^^^^^^^ -----------
help: consider borrowing here
    |
425 |     let f = uefi_fs::File::from_path(&path, file::MODE_READ, 0)?;
    |                                      +

error[E0308]: mismatched types
   --> library/std/src/sys/fs/uefi.rs:552:8
    |
---

error[E0308]: mismatched types
   --> library/std/src/sys/fs/uefi.rs:276:38
    |
276 |         if opts.create_new && exists(path.clone())? {
    |                               ------ ^^^^^^^^^^^^ expected `&Path`, found `PathBuf`
    |                               |
    |                               arguments to this function are incorrect
    |
note: function defined here
   --> library/std/src/sys/fs/uefi.rs:520:8
    |
520 | pub fn exists(path: &Path) -> io::Result<bool> {
    |        ^^^^^^ -----------
help: consider borrowing here
    |
276 |         if opts.create_new && exists(&path.clone())? {
    |                                      +

error[E0308]: mismatched types
   --> library/std/src/sys/fs/uefi.rs:280:42
    |
280 |         let f = uefi_fs::File::from_path(path, opts.mode, 0).map(Self)?;
    |                 ------------------------ ^^^^ expected `&Path`, found `PathBuf`
    |                 |
    |                 arguments to this function are incorrect
    |
note: associated function defined here
   --> library/std/src/sys/fs/uefi.rs:608:23
    |
607 |     impl File {
608 |         pub(crate) fn from_path(path: &Path, open_mode: u64, attr: u64) -> io::Result<Self> {
    |                       ^^^^^^^^^ -----------
help: consider borrowing here
    |
280 |         let f = uefi_fs::File::from_path(&path, opts.mode, 0).map(Self)?;
    |                                          +

For more information about this error, try `rustc --explain E0308`.
[RUSTC-TIMING] std test:false 1.506
warning: `std` (lib) generated 1 warning

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 13, 2026
@rust-bors

rust-bors Bot commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

PR #159805, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 13, 2026
@rust-bors

rust-bors Bot commented Nov 14, 2026

Copy link
Copy Markdown
Contributor

💥 Test timed out after 21600s

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-bootstrap-stamp Area: bootstrap stamp logic A-filesystem Area: `std::fs` A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-path Area: `std::path` (note: `std::fs` is A-filesystem) A-slice-vec Area: `[T]` and `Vec<T>` rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.