Skip to content

Rollup of 7 pull requests - #138279

Merged
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ndnoipr
Mar 9, 2025
Merged

Rollup of 7 pull requests#138279
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ndnoipr

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Zoxcand others added 16 commits March 3, 2025 13:44
Apply dllimport in ThinLTO
This partially reverts rust-lang#103353 by properly applying `dllimport` if `-Z dylib-lto` is passed. That PR should probably fully be reverted as it looks quite sketchy. We don't know locally if the entire crate graph would be statically linked.
This should hopefully be sufficient to make ThinLTO work for rustc on Windows.
r? ``@wesleywiser``
---
Edit: This PR is changed to just generally revert rust-lang#103353.
Move `fs` into `sys`
Move platform definitions of `fs` into `std::sys`, as part of rust-lang#117276.
cc `@joboet`
Use `disjoint_bitor` inside `borrowing_sub`
This makes the definition of `borrowing_sub` consistent with that of `carrying_add`.
Windows: Don't link std (and run-make) against advapi32, except on win7
Std no longer depends on any functionality provided by advapi32, so we can remove it from the list of external libraries we link against. Except, the win7 targets do still rely on advapi32-provided functionality. This PR therefore moves linking against it to only occur on win7 targets, so that no new uses of it slip in without being noticed.
…nszelmann
Continue to check attr if meet empty repr for adt
Fixesrust-lang#138241
Returning while checking ReprEmpty results in missing the check for the next repr
…ouxu
Fix `repr128-dwarf` test
The test now correctly ignores enums from `std`.
Fixesrust-lang#138254
Unblocks rust-lang#138200
…enton
Lazy load NtOpenFile for UWP
Lazily load `NtOpenFile` to allow libraries targeting UWP to build and link.
Fixesrust-lang#138257 .
r? `@ChrisDenton`
@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-run-make Area: port run-make Makefiles to rmake.rs O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 9, 2025
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Mar 9, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 33530e4 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Mar 9, 2025
@bors

bors commented Mar 9, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 33530e4 with merge 3ea711f...

@bors

bors commented Mar 9, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3ea711f to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 9, 2025
@bors
bors merged commit 3ea711f into rust-lang:masterMar 9, 2025
@rustbotrustbot added this to the 1.87.0 milestone Mar 9, 2025
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

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

gh pr comment ${HEAD_PR} -F output.log
shell: /usr/bin/bash -e {0}
##[endgroup]
fatal: ambiguous argument 'HEAD^1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
##[error]Process completed with exit code 128.

@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#122790Apply dllimport in ThinLTO2f97b8dd9ee4e825456579d49eaf6d67166f710d (link)
#137650Move fs into sys5b50814e93592d7407146c5eda9556138838e2ec (link)
#138228Use disjoint_bitor inside borrowing_subfc88c6aec2390644f51a517ad771d1864c160fa8 (link)
#138233Windows: Don't link std (and run-make) against advapi32, ex…5aa4714bb1a3a6bb65927d8265000541dbfeed48 (link)
#138253Continue to check attr if meet empty repr for adt1ed2d1c05b623387b9a49c18d52579e83da30b7a (link)
#138263Fix repr128-dwarf test9656867b01234ba9fd96ae5805898e0ea4df1c5c (link)
#138276Lazy load NtOpenFile for UWPf424ec197c53058b45d4adfbb6e1947934abc626 (link)

previous master: 385970f0c1

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (3ea711f): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
0.5%[0.5%, 0.5%]2
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (primary -2.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.3%[-2.3%, -2.3%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-2.3%[-2.3%, -2.3%]1

Cycles

Results (secondary -8.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-8.4%[-8.4%, -8.4%]1
All ❌✅ (primary)--0

Binary size

Results (primary -0.0%, secondary -0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.0%[-0.0%, -0.0%]3
Improvements ✅
(secondary)
-0.0%[-0.0%, -0.0%]1
All ❌✅ (primary)-0.0%[-0.0%, -0.0%]3

Bootstrap: 769.881s -> 770.102s (0.03%)
Artifact size: 361.99 MiB -> 361.98 MiB (-0.00%)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)A-run-makeArea: port run-make Makefiles to rmake.rsmerged-by-borsThis PR was explicitly merged by bors.O-hermitOperating System: HermitO-SGXTarget: SGXO-solidOperating System: SOLIDO-unixOperating system: Unix-likeO-wasiOperating system: Wasi, Webassembly System InterfaceO-wasmTarget: WASM (WebAssembly), http://webassembly.org/O-windowsOperating system: WindowsrollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@matthiaskrgr@bors@rust-log-analyzer@rust-timer@rustbot@Zoxc@TDecking@smmalis37@thaliaarchi@mu001999@beetrees@bdbai