Skip to content
New issue

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

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

Already on GitHub? # to your account

Move windows-sys arm32 shim to c.rs #113001

Merged
merged 1 commit into from
Jun 25, 2023
Merged

Conversation

ChrisDenton
Copy link
Member

This moves the arm32 shim in to c.rs instead of appending to the generated file itself.

This makes it simpler to change these workarounds if/when needed. The downside is we need to exclude a couple of functions from being generated (see the comment). A metadata solution could help here but they'll be easy enough to add back if that happens.

@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2023

r? @thomcc

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 24, 2023
@thomcc
Copy link
Member

thomcc commented Jun 25, 2023

This seems fine.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 25, 2023

📌 Commit 8a7399c has been approved by thomcc

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 Jun 25, 2023
@bors
Copy link
Contributor

bors commented Jun 25, 2023

⌛ Testing commit 8a7399c with merge c51fbb3...

@bors
Copy link
Contributor

bors commented Jun 25, 2023

☀️ Test successful - checks-actions
Approved by: thomcc
Pushing c51fbb3 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Jun 25, 2023

☀️ Test successful - checks-actions
Approved by: thomcc
Pushing c51fbb3 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Jun 25, 2023
@bors bors merged commit c51fbb3 into rust-lang:master Jun 25, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 25, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c51fbb3): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.7% [-0.7%, -0.7%] 1
Improvements ✅
(secondary)
-1.2% [-1.3%, -1.1%] 6
All ❌✅ (primary) -0.7% [-0.7%, -0.7%] 1

Max RSS (memory usage)

Results

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.

mean range count
Regressions ❌
(primary)
4.1% [4.1%, 4.1%] 1
Regressions ❌
(secondary)
2.0% [2.0%, 2.1%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 4.1% [4.1%, 4.1%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 660.819s -> 662.219s (0.21%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant 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.

5 participants