Skip to content

Rollup of 6 pull requests #107106

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 14 commits into from
Jan 20, 2023
Merged

Rollup of 6 pull requests #107106

merged 14 commits into from
Jan 20, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eholk and others added 14 commits January 12, 2023 11:58
@eholk
Add a test case for rust-lang#102383
96de375
@eholk
[drop tracking] Visit break expressions
d32f3fe 
This fixes rust-lang#102383 by remembering to visit the expression in
`break expr` when building the drop tracking CFG. Missing this step was
causing an off-by-one error which meant after a number of awaits we'd be
looking for dropped values at the wrong point in the code.

Additionally, this changes the order of traversal for assignment
expressions to visit the rhs and then the lhs. This matches what is done
elsewhere.
@Alexendoo @flip1995
Move unchecked_duration_subtraction to pedantic
d6f565b
@mejrs
Autoderive ExternBlockSuggestion
cc5af33
@bvanjoi
add raw identifier for keyword in suggestion
97ae79a
@estebank
Tweak "borrow closure argument" suggestion
33e11a3 
Fix rust-lang#45727.
@compiler-errors
Fix known-bug, silence ICE stderr
3eecdd1
@compiler-errors
Make bare known-bug an error
a3d5be6
@matthiaskrgr
Rollup merge of rust-lang#106699 - eholk:await-chains-drop-tracking, …
3d79cbc 
…r=wesleywiser

[drop tracking] Visit break expressions

This fixes rust-lang#102383 by remembering to visit the expression in `break expr` when building the drop tracking CFG. Missing this step was causing an off-by-one error which meant after a number of awaits we'd be
looking for dropped values at the wrong point in the code.

Additionally, this changes the order of traversal for assignment expressions to visit the rhs and then the lhs. This matches what is done elsewhere.

Finally, this improves some of the debugging output (for example, the CFG visualizer) to make it easier to figure out these sorts of issues.
@matthiaskrgr
Rollup merge of rust-lang#106738 - compiler-errors:known-bugs-oops, r…
720a9f1 
…=jackh726

Fix known-bug annotations

r? ``@Nilstrieb``
@matthiaskrgr
Rollup merge of rust-lang#106891 - estebank:issue-45727, r=petrochenkov
5f2ad80 
Tweak "borrow closure argument" suggestion

Fix rust-lang#45727.
@matthiaskrgr
Rollup merge of rust-lang#106928 - bvanjoi:print-keyword-raw-identifi…
da7a0c0 
…er, r=petrochenkov

add raw identifier for keyword in suggestion

fix rust-lang#106841
@matthiaskrgr
Rollup merge of rust-lang#107065 - flip1995:clippyup, r=Manishearth
12d2136 
Clippy: Make sure to include in beta: Move `unchecked_duration_subtraction` to pedantic

This was merged one day too late in order to make it into the last sync. But since we talked about moving this lint to `pedantic` in the meeting, I'd like to get this in rather sooner than later.

rust-lang/rust-clippy#10194

r? ``@Manishearth``
@matthiaskrgr
Rollup merge of rust-lang#107068 - mejrs:use_derive, r=estebank
c44c60c 
autoderive Subdiagnostic for AddtoExternBlockSuggestion
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. rollup A PR which is a rollup labels Jan 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Jan 20, 2023

📌 Commit c44c60c 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 Jan 20, 2023
@bors
Copy link
Collaborator

bors commented Jan 20, 2023

⌛ Testing commit c44c60c with merge e85ac8f608190f7dde8a37de6c451781437f90a9...

@bors
Copy link
Collaborator

bors commented Jan 20, 2023

💔 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 Jan 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry
warning: spurious network error (2 tries remaining): failed to get successful HTTP response from [https://crates.io/api/v1/crates/bitflags/1.3.2/download](https://crates.io/api/v1/crates/bitflags/1.3.2/download%60), got 502

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 20, 2023
@rust-log-analyzer
Copy link
Collaborator

The job i686-gnu-nopt failed! Check out the build log: (web) (plain)

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

@GuillaumeGomez
Copy link
Member

Isn't it unneeded now that there is #107105?

@matthiaskrgr
Copy link
Member Author

@GuillaumeGomez there are no overlapping PRs in these two :)

@GuillaumeGomez
Copy link
Member

Oh indeed. Nevermind!

@bors
Copy link
Collaborator

bors commented Jan 20, 2023

⌛ Testing commit c44c60c with merge a6269da...

@bors
Copy link
Collaborator

bors commented Jan 20, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 20, 2023
@bors bors merged commit a6269da into rust-lang:master Jan 20, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 20, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#107068 4c8a3bf22d319347d4ba3e644a712fd8ee494772
#107065 54c9ac57f15a4ba5f0ec6040be08856184f0cd49
#106928 19bc653d9151a25b4603edeaf64303c13d264a2e
#106891 8dddca5255cccf7e3a09c88c4ad91a96552857fe
#106738 5cefd9c6fb10a5f711384353f5c818e4d5069fe3
#106699 6782689d0286b4e0ccb0b6366b1adb007f59d87c

previous master: 04a41f889f

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 (a6269da): 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
Improvements ✅
(secondary)		 -2.6% [-2.6%, -2.6%] 1
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)		 1.7% [1.7%, 1.7%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

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)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.3% [-2.6%, -2.0%] 2
All ❌✅ (primary) - - 0

@matthiaskrgr matthiaskrgr deleted the rollup-g7r1ep0 branch March 16, 2024 18:19
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
A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.