Skip to content

Rollup of 6 pull requests #147807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 26 commits into from
Closed

Rollup of 6 pull requests #147807

wants to merge 26 commits into from

Conversation

samueltardieu
Copy link
Member

@samueltardieu samueltardieu commented Oct 17, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshtriplett and others added 26 commits October 7, 2025 13:16
@joshtriplett
library: fs: Factor out a file_time_to_timespec function in prepara…
1e6b444 
…tion for reusing it
@joshtriplett
library: fs: Factor out the Apple file time to attrlist code for reuse
1bf555c
@chenyukang
Implement fs api set_times and set_times_nofollow
7225454
@chenyukang @joshtriplett
Update library/std/src/fs.rs
3d40fa6 
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@chenyukang @joshtriplett
Update library/std/src/fs.rs
6308e76 
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@chenyukang @joshtriplett
use proper unsupported
1c5c8ca
@chenyukang @joshtriplett
rebase rust-lang#147504
46c6f0a
@chenyukang @joshtriplett
support fs::set_times for wasi
2438df7
@chenyukang @joshtriplett
add doc alias for set_times_nofollow
1dd5641 
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@chenyukang @joshtriplett
add doc alias for set_times
6fd1c2b 
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@chenyukang
fix c_char error in Android
901366a
@joshtriplett
unsupported: Use unsupported() for set_times
f8118d8
@joshtriplett
unsupported: Use unsupported() for set_times_nofollow
d2f590a
@notriddle
rustdoc-search: stringdex 0.0.2
fdeb363 
Two index format tweaks that reduce the size of the standard
library, compiler, and wordnet dictionary when I test it.
@chenyukang
Fix compiling error for redox etc
8182085
@yotamofek
Move Vec of locals instead of pushing every element
9361d64
@beepster4096
undo CopyForDeref assertion in const qualif
f1b180a
@beepster4096
add regression test
5ffbec8
@durin42
bootstrap: migrate to object 0.37
10a5334 
I noticed we had a mix of 0.37 and 0.36 at work, and this was why. As
far as I can tell everything still works fine.
@rcvalle
CFI: Rewrite FnPtrShim when generalizing
3821bac 
When looking for instances which could either be dynamically called
through a vtable or through a concrete trait method, we missed
`FnPtrShim`, instead only looking at `Item` and closure-likes.
@samueltardieu
Rollup merge of rust-lang#144936 - rcvalle:rust-cfi-fix-144641, r=lcnr
8f6b94f 
CFI: Fix types that implement Fn, FnMut, or FnOnce

When looking for instances which could either be dynamically called through a vtable or through a concrete trait method, we missed `FnPtrShim`, instead only looking at `Item` and closure-likes. Fixes rust-lang#144641.

cc `@1c3t3a` `@Jakob-Koschel`
@samueltardieu
Rollup merge of rust-lang#147468 - chenyukang:yukang-api-set-times, r…
e973edd 
…=joshtriplett

Implement fs api set_times and set_times_nofollow

implementation of rust-lang#147455

r? `@joshtriplett`
@samueltardieu
Rollup merge of rust-lang#147660 - notriddle:stringdex-002, r=Guillau…
d6add5d 
…meGomez

rustdoc-search: stringdex 0.0.2

Two index format tweaks that reduce the size of the standard library, compiler, and wordnet dictionary when I test it.

CC rust-lang#146048

FF Profiler output: https://share.firefox.dev/4onH5xP

Preview: https://notriddle.com/rustdoc-html-demo-12/stringdex-002/std/index.html
@samueltardieu
Rollup merge of rust-lang#147735 - yotamofek:pr/ssa/initialize_locals…
0757387 
…_opt, r=JonathanBrouwer

Micro-optimization in `FunctionCx::initialize_locals`

This showed up in a profile I was looking at, hoping this might improve perf by a little bit.
@samueltardieu
Rollup merge of rust-lang#147764 - beepster4096:oopsies_sorry, r=saet…
a589edf 
…hlin

Undo CopyForDeref assertion in const qualif

Fixes rust-lang#147733 caused by rust-lang#145513

This code in fact does not run only on runtime MIR.
@samueltardieu
Rollup merge of rust-lang#147783 - durin42:object-unification, r=Zala…
fd7e47e 
…thar

bootstrap: migrate to object 0.37

I noticed we had a mix of 0.37 and 0.36 at work, and this was why. As far as I can tell everything still builds and works correctly.
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 17, 2025
@rustbot rustbot added 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. rollup A PR which is a rollup labels Oct 17, 2025
@samueltardieu
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 17, 2025

📌 Commit fd7e47e has been approved by samueltardieu

It is now in the queue for this repository.

@bors bors 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 Oct 17, 2025
@bors
Copy link
Collaborator

bors commented Oct 17, 2025

⌛ Testing commit fd7e47e with merge 916fba5...

bors added a commit that referenced this pull request Oct 17, 2025
@bors
Auto merge of #147807 - samueltardieu:rollup-r0jucvf, r=samueltardieu
916fba5 
Rollup of 6 pull requests

Successful merges:

 - #144936 (CFI: Fix types that implement Fn, FnMut, or FnOnce)
 - #147468 (Implement fs api set_times and set_times_nofollow)
 - #147660 (rustdoc-search: stringdex 0.0.2)
 - #147735 (Micro-optimization in `FunctionCx::initialize_locals`)
 - #147764 (Undo CopyForDeref assertion in const qualif)
 - #147783 (bootstrap: migrate to object 0.37)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
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) 
---- [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/sanitizer/kcfi/fn-trait-objects.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-musl" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/sanitizer/kcfi/fn-trait-objects/a" "-A" "internal_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-musl/native/rust-test-helpers" "-Clinker=x86_64-linux-musl-gcc" "-Ctarget-feature=-crt-static" "-Zpanic_abort_tests" "-Cpanic=abort" "-Cprefer-dynamic=off" "-Copt-level=0" "-Zsanitizer=kcfi" "-Cunsafe-allow-abi-mismatch=sanitizer" "--test"
stdout: none
--- stderr -------------------------------
error: kcfi sanitizer is not supported for this target

error: aborting due to 1 previous error

@bors
Copy link
Collaborator

bors commented Oct 17, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2025
@samueltardieu samueltardieu mentioned this pull request Oct 17, 2025
Open
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.