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

Improve E0585 help #102351

Merged
merged 1 commit into from
Sep 29, 2022
Merged

Improve E0585 help #102351

merged 1 commit into from
Sep 29, 2022

Conversation

Rageking8
Copy link
Contributor

No description provided.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 27, 2022
@rust-highfive
Copy link
Collaborator

r? @wesleywiser

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2022
@bors
Copy link
Contributor

bors commented Sep 28, 2022

☔ The latest upstream changes (presumably #101619) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems reasonable to me!

@wesleywiser
Copy link
Member

@Rageking8 if you can rebase and resolve the merge conflict, I'd be happy to r+

@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@Rageking8
Copy link
Contributor Author

Rageking8 commented Sep 28, 2022

Oops, new to git and cargo submodules changes keep slipping in. I think I fixed it.

Edit: Fix successful.

@rustbot rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Sep 28, 2022
@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2022

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@Rageking8
Copy link
Contributor Author

@wesleywiser Fixed the merge conflicts and CI failures, may I get a rereview (added a few more changes to make CI pass). Thanks.

@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 29, 2022

📌 Commit 2ee2ffa has been approved by wesleywiser

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 Sep 29, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2022
Rollup of 8 pull requests

Successful merges:

 - rust-lang#98368 (Make `std::os::fd` public.)
 - rust-lang#102085 (Code refactoring smart_resolve_report_errors)
 - rust-lang#102351 (Improve E0585 help)
 - rust-lang#102368 (Add a niche to `Duration`, unix `SystemTime`, and non-apple `Instant`)
 - rust-lang#102393 (Add regression test for issue 94923)
 - rust-lang#102399 (Account for use of index-based lifetime names in print of binder)
 - rust-lang#102416 (remove FIXME, improve documentation)
 - rust-lang#102433 (env::temp_dir: fix a typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 19e84b9 into rust-lang:master Sep 29, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 29, 2022
@Rageking8 Rageking8 deleted the improve-E0585 branch October 1, 2022 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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
Development

Successfully merging this pull request may close these issues.

5 participants