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.

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

[stable] Prepare 1.58.1 point release #93071

Merged
merged 6 commits into from
Jan 20, 2022
Merged

[stable] Prepare 1.58.1 point release #93071

merged 6 commits into from
Jan 20, 2022

Conversation

pietroalbini
Copy link
Member

calebcartwright and others added 3 commits January 19, 2022 10:25
@calebcartwright @pietroalbini
fix(rustfmt): resolve generated file formatting issue
b167157
@Aaron1011 @pietroalbini
Only check for errors in predicate when skipping impl assembly
70a61c9 
Prior to PR rust-lang#91205, checking for errors in the overall obligation
would check checking the `ParamEnv`, due to an incorrect
`super_visit_with` impl. With this bug fixed, we will now
bail out of impl candidate assembly if the `ParamEnv` contains
any error types.

In practice, this appears to be overly conservative - when an error
occurs early in compilation, we end up giving up early for some
predicates that we could have successfully evaluated without overflow.
By only checking for errors in the predicate itself, we avoid causing
additional spurious 'type annotations needed' errors after a 'real'
error has already occurred.

With this PR, the diagnostic changes caused by PR rust-lang#91205 are reverted.
@Qwaz @pietroalbini
Move non_send_fields_in_send_ty back to nursery
a14ae6f
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 19, 2022
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 19, 2022
@pietroalbini
Copy link
Member Author

@bors r+ rollup=never p=1000

@bors
Copy link
Contributor

bors commented Jan 19, 2022

📌 Commit 32ff53a592bd983b5395db73bb028ff476163ee2 has been approved by pietroalbini

@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 19, 2022
@bors
Copy link
Contributor

bors commented Jan 19, 2022

⌛ Testing commit 32ff53a592bd983b5395db73bb028ff476163ee2 with merge 58928383a8d667b42dcceb7c1c51109cbfa18f60...

@bors
Copy link
Contributor

bors commented Jan 19, 2022

💔 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 19, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pietroalbini
Copy link
Member Author

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Jan 19, 2022

📌 Commit acd6476 has been approved by pietroalbini

@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 19, 2022
@bors
Copy link
Contributor

bors commented Jan 19, 2022

⌛ Testing commit acd6476 with merge e447eaeefb05603017d33000629002f4cad9e7b8...

@bors
Copy link
Contributor

bors commented Jan 19, 2022

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 19, 2022
@bjorn3 bjorn3 mentioned this pull request Jan 19, 2022
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 19, 2022

💔 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 19, 2022
@pietroalbini
Copy link
Member Author

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Jan 19, 2022

📌 Commit 0076b17 has been approved by pietroalbini

@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 19, 2022
@bors
Copy link
Contributor

bors commented Jan 19, 2022

⌛ Testing commit 0076b17 with merge ad15dbec1f7eb09524da5d434121d57ad6bb2844...

@camsteffen
Copy link
Contributor

Sorry, don't know if this is way too late. I think we should include rust-lang/rust-clippy#7945? (fix for rust-lang/rust-clippy#7934, rust-lang/rust-clippy#8307) @flip1995

@flip1995
Copy link
Member

If bors should fail again and @pietroalbini has the patience to include those, sure.

@bors
Copy link
Contributor

bors commented Jan 19, 2022

💥 Test timed out

@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 19, 2022
@rust-log-analyzer
Copy link
Collaborator

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

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

@pietroalbini
Copy link
Member Author

@camsteffen hi! While we could add that bug fix to the point release, I got the release to a point where we know it doesn't have CI failures (it just timed out due to a couple slow builders), and I'm wary of adding more changes. We need it to build successfully today and adding extra code increases the risk of the build failing.

@flip1995
Copy link
Member

@pietroalbini I agree. Let's get this merged as-is then. I'll make sure that those fixes at least get into beta (if they aren't already)

@pietroalbini
Copy link
Member Author

(do not retry this PR)

@pietroalbini pietroalbini mentioned this pull request Jan 20, 2022
Merged
@pietroalbini
Copy link
Member Author

Superseded by #93110

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2022
@bors
Auto merge of rust-lang#93110 - pietroalbini:pa-cve-2022-21658-stable…
08182e4 
…, r=pietroalbini

[stable] Fix CVE 2022 21658 and prepare 1.58.1

Followup to rust-lang#93071. Includes the fix for CVE-2022-21658.

r? `@ghost`
cc `@rust-lang/release` `@rust-lang/security`
@bors bors merged commit 0076b17 into rust-lang:stable Jan 20, 2022
@cuviper cuviper added this to the 1.58.1 milestone Nov 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
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.
Projects
None yet
Milestone
1.58.1
Development

Successfully merging this pull request may close these issues.