Skip to content

Rollup of 2 pull requests #124590

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
Merged
merged 5 commits into from
May 1, 2024
Merged

Rollup of 2 pull requests #124590

merged 5 commits into from
May 1, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

CBSpeir and others added 5 commits April 29, 2024 17:36
@CBSpeir
Add diagnostic item for std::iter::Iterator::enumerate
c8079e9
@lcnr
fix NormalizesTo proof tree issue
da969d4
@lcnr
review
f323f9d
@matthiaskrgr
Rollup merge of rust-lang#124542 - CBSpeir:diagnostic-item-enumerate-…
38cbad9 
…method, r=scottmcm

Add diagnostic item for `std::iter::Iterator::enumerate`

Adds a diagnostic item for the `std::iter:Iterator::enumerate` trait method. This change, along with PR rust-lang#124308, will be used by the clippy `unused_enumerate_index` lint to move away from paths to using diagnostic items.

see: rust-lang/rust-clippy#5393
@matthiaskrgr
Rollup merge of rust-lang#124566 - lcnr:normalizes-to-proof-tree, r=c…
0dbe07f 
…ompiler-errors

fix `NormalizesTo` proof tree issue

fixes rust-lang#124422
cc rust-lang#121848

r? ``@compiler-errors``
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels May 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented May 1, 2024

📌 Commit 0dbe07f has been approved by matthiaskrgr

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 May 1, 2024
@bors
Copy link
Collaborator

bors commented May 1, 2024

⌛ Testing commit 0dbe07f with merge be9bca2...

@bors
Copy link
Collaborator

bors commented May 1, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 1, 2024
@bors bors merged commit be9bca2 into rust-lang:master May 1, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 1, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#124542 Add diagnostic item for std::iter::Iterator::enumerate 21c0432b7376647f057a7ec103619ffa5375d281 (link)
#124566 fix NormalizesTo proof tree issue fa7ab15167ede3850ea05a40f56765ff68a9e0b3 (link)

previous master: 9ba3d315b4

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
Collaborator

Finished benchmarking commit (be9bca2): comparison URL.

Overall result: ❌ regressions - 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.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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)		 - - 0
Regressions ❌
(secondary)		 6.9% [6.9%, 6.9%] 1
Improvements ✅
(primary)		 -2.3% [-2.3%, -2.3%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.3% [-2.3%, -2.3%] 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: 673.915s -> 673.832s (-0.01%)
Artifact size: 315.97 MiB -> 315.97 MiB (-0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-091hpnp branch September 1, 2024 17:35
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
merged-by-bors This PR was explicitly merged by bors. 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-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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
6 participants
@matthiaskrgr @bors @rust-timer @rustbot @CBSpeir @lcnr