Skip to content

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

Shunpoco and others added 30 commits December 25, 2025 12:15
Define a new function ensure_version which is extracted (and modified) from ensure_version_or_cargo_install.
for other extra checks, it is WIP.
This updates the rust-version file to 23d01cd.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 23d01cd
Filtered ref: 5d28c73d267214190903896b4caf2e40a17a56cb
Upstream diff: rust-lang/rust@2dc3024...23d01cd

This merge was created using https://github.com/rust-lang/josh-sync.
…emove unsafe from usages"

We can't drop the `unsafe` here because it is required at the `libm`
MSRV. Instead, we will need to `allow` the lint.

This reverts commit 96ac3624abc144db930d94504a9c67aad7b949ed.
Make it easier to run the same steps outside of GitHub Actions.
- Using the implementation from sys::fs::common since UEFI does not have
  a built-in for this functionality.

Signed-off-by: Ayush Singh <[email protected]>
Similarly to i686 and X86_64 MinGW targets, Rust needs to provide the
right chkstk symbol for AArch64 to avoid relying on the linker to
provide it.

CC rust-lang#150725
This commit moves a query to `associated_item_defs` from above an error
condition caused independently of it to below it.

It looks generally cleaner and might potentially save some runtime in
case the error condition is met, rendering `items` to be left unused,
yet still queried.
…k, r=lolbinarycat

tidy: add if-installed prefix condition to extra checks system

Ref: https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Should.20Spellcheck.20check.20all.20files.3F/with/543227610

tidy now runs spellcheck (typos-cli) without adding `--extra-checks=spellcheck` option if the tool is already installed under ./build/misc-tools and the version is expected.
It will improve code quality without bothering engineers who doesn't want to use typos or who cleans up ./build directory frequently.
std: sys: fs: uefi: Implement remove_dir_all

- Using the implementation from sys::fs::common since UEFI does not have a built-in for this functionality.

@rustbot label +O-UEFI
Minor cleanups to fn_abi_new_uncached
compiler-builtins subtree update

Subtree update of `compiler-builtins` to rust-lang/compiler-builtins@65624df.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
Update `literal-escaper` version to `0.0.7`

It removes the `std` dependency for this crate (which doesn't change anything for rustc 😄 ).

cc @bjorn3
r? @Urgau
Store defids instead of symbol names in the aliases list

I was honestly surprised this worked in the past. This causes a cycle error since we now compute a symbol name in codegen_attrs, and then compute codegen attrs when we try to get the symbol name.

It only worked when there weren't any codegen attributes to begin with, causing symbol name computation to skip the call to codegen_attrs.

Like this we won't have the same problem.

r? @bjorn3
Query associated_item_def_ids when needed

This commit moves a query to `associated_item_defs` from above an error condition caused independently of it to below it.

It looks generally cleaner and might potentially save some runtime in case the error condition is met, rendering `items` to be left unused, yet still queried.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 8, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-tidy Area: The tidy tool 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 Jan 8, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@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 Jan 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

📌 Commit 8987204 has been approved by matthiaskrgr

It is now in the queue for this repository.

@matthiaskrgr
Copy link
Member Author

@bors2 try jobs=dist-ohos-x86_64

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

Unknown command "2". Run @bors help to see available commands.

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Jan 8, 2026
Rollup of 11 pull requests

try-job: dist-ohos-x86_64
@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 Jan 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

💔 Test for 59f69b3 failed: CI. Failed jobs:

@rust-log-analyzer
Copy link
Collaborator

The job dist-ohos-x86_64 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling addr2line v0.25.1
[RUSTC-TIMING] addr2line test:false 0.602
[RUSTC-TIMING] gimli test:false 4.523
[RUSTC-TIMING] object test:false 5.049
error[E0609]: no field `st_atime` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:370:30
    |
370 |         file_attr.as_inner().st_atime as i64
    |                              ^^^^^^^^ unknown field
    |
help: a field with a similar name exists
    |
370 -         file_attr.as_inner().st_atime as i64
370 +         file_attr.as_inner().st_atim as i64
    |

error[E0609]: no field `st_atime_nsec` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:373:36
    |
373 |         self.as_inner().as_inner().st_atime_nsec as i64
    |                                    ^^^^^^^^^^^^^ unknown field
    |
    = note: available fields are: `st_dev`, `st_ino`, `st_nlink`, `st_mode`, `st_uid` ... and 8 others

error[E0609]: no field `st_mtime` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:381:30
    |
381 |         file_attr.as_inner().st_mtime as i64
    |                              ^^^^^^^^ unknown field
    |
help: a field with a similar name exists
    |
381 -         file_attr.as_inner().st_mtime as i64
381 +         file_attr.as_inner().st_mtim as i64
    |

error[E0609]: no field `st_mtime_nsec` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:384:36
    |
384 |         self.as_inner().as_inner().st_mtime_nsec as i64
    |                                    ^^^^^^^^^^^^^ unknown field
    |
    = note: available fields are: `st_dev`, `st_ino`, `st_nlink`, `st_mode`, `st_uid` ... and 8 others

error[E0609]: no field `st_ctime` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:392:30
    |
392 |         file_attr.as_inner().st_ctime as i64
    |                              ^^^^^^^^ unknown field
    |
help: a field with a similar name exists
    |
392 -         file_attr.as_inner().st_ctime as i64
392 +         file_attr.as_inner().st_ctim as i64
    |

error[E0609]: no field `st_ctime_nsec` on type `&libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/os/linux/fs.rs:395:36
    |
395 |         self.as_inner().as_inner().st_ctime_nsec as i64
    |                                    ^^^^^^^^^^^^^ unknown field
    |
    = note: available fields are: `st_dev`, `st_ino`, `st_nlink`, `st_mode`, `st_uid` ... and 8 others

error[E0609]: no field `st_mtime` on type `libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/sys/fs/unix.rs:633:35
    |
633 |         SystemTime::new(self.stat.st_mtime as i64, self.stat.st_mtime_nsec as i64)
    |                                   ^^^^^^^^ unknown field
    |
help: a field with a similar name exists
    |
633 -         SystemTime::new(self.stat.st_mtime as i64, self.stat.st_mtime_nsec as i64)
633 +         SystemTime::new(self.stat.st_mtim as i64, self.stat.st_mtime_nsec as i64)
    |

error[E0609]: no field `st_mtime_nsec` on type `libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/sys/fs/unix.rs:633:62
    |
633 |         SystemTime::new(self.stat.st_mtime as i64, self.stat.st_mtime_nsec as i64)
    |                                                              ^^^^^^^^^^^^^ unknown field
    |
    = note: available fields are: `st_dev`, `st_ino`, `st_nlink`, `st_mode`, `st_uid` ... and 8 others

error[E0609]: no field `st_atime` on type `libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/sys/fs/unix.rs:668:35
    |
668 |         SystemTime::new(self.stat.st_atime as i64, self.stat.st_atime_nsec as i64)
    |                                   ^^^^^^^^ unknown field
    |
help: a field with a similar name exists
    |
668 -         SystemTime::new(self.stat.st_atime as i64, self.stat.st_atime_nsec as i64)
668 +         SystemTime::new(self.stat.st_atim as i64, self.stat.st_atime_nsec as i64)
    |

error[E0609]: no field `st_atime_nsec` on type `libc::stat`
   --> /rustc/59f69b325c41143c6a62bf9127396d935f24d86a/library/std/src/sys/fs/unix.rs:668:62
    |
668 |         SystemTime::new(self.stat.st_atime as i64, self.stat.st_atime_nsec as i64)
    |                                                              ^^^^^^^^^^^^^ unknown field
    |
    = note: available fields are: `st_dev`, `st_ino`, `st_nlink`, `st_mode`, `st_uid` ... and 8 others

For more information about this error, try `rustc --explain E0609`.
[RUSTC-TIMING] std test:false 3.610
error: could not compile `std` (lib) due to 10 previous errors
Bootstrap failed while executing `dist --host=x86_64-unknown-linux-ohos --target x86_64-unknown-linux-ohos`

@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 Jan 8, 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-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-tidy Area: The tidy tool rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.