Skip to content
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.

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

Revert "Auto merge of #133654 - weihanglo:update-cargo, r=weihanglo" #133671

Merged
merged 1 commit into from
Nov 30, 2024

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Nov 30, 2024

This reverts commit 76f3ff6, reversing changes made to 1fc691e.

The new pgo_works test fails when rust is built without profiling support, including in CI on x86_64-gnu-aux. See #133499 (comment) for how this happened.

…ihanglo"

This reverts commit 76f3ff6, reversing
changes made to 1fc691e.

The new pgo_works test fails when rust is built without profiling
support, including in CI on x86_64-gnu-aux.
@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2024

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2024

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2024
@nikic
Copy link
Contributor Author

nikic commented Nov 30, 2024

@bors treeclosed=100

@lqd
Copy link
Member

lqd commented Nov 30, 2024

r=me if you don't need a t-cargo approval

@nikic
Copy link
Contributor Author

nikic commented Nov 30, 2024

Don't think we need t-cargo approval as this is just a revert.

@bors r=lqd p=1000

@bors
Copy link
Contributor

bors commented Nov 30, 2024

📌 Commit f5691ba has been approved by lqd

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Nov 30, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Nov 30, 2024
@bors
Copy link
Contributor

bors commented Nov 30, 2024

⌛ Testing commit f5691ba with merge e48ddd8...

@RalfJung
Copy link
Member

Assuming this will land, let's make sure the queue can proceed immediately.

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Nov 30, 2024

☀️ Test successful - checks-actions
Approved by: lqd
Pushing e48ddd8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 30, 2024
@bors bors merged commit e48ddd8 into rust-lang:master Nov 30, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Nov 30, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e48ddd8): comparison URL.

Overall result: ✅ improvements - 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.

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

Max RSS (memory usage)

Results (primary 0.6%)

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)
0.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [0.6%, 0.6%] 1

Cycles

Results (primary -5.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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-5.0% [-5.0%, -5.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -5.0% [-5.0%, -5.0%] 1

Binary size

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

Bootstrap: 773.805s -> 773.769s (-0.00%)
Artifact size: 332.32 MiB -> 332.32 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants