Improve E0585 help#102351
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 29, 2022
Rageking8:improve-E0585
Merged
Conversation
rustbot
added
the
T-compiler
Contributor
|
r? @wesleywiser (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Rageking8
commented
Sep 27, 2022
Collaborator
|
☔ The latest upstream changes (presumably #101619) made this pull request unmergeable. Please resolve the merge conflicts. |
wesleywiser
approved these changes
Sep 28, 2022
Member
wesleywiser
left a comment
wesleywiser
left a comment
There was a problem hiding this comment.
This seems reasonable to me!
Member
|
@Rageking8 if you can rebase and resolve the merge conflict, I'd be happy to r+ |
Collaborator
|
Some changes occurred in src/tools/cargo cc @ehuss |
Contributor
Author
|
Oops, new to git and cargo submodules changes keep slipping in. I think I fixed it. Edit: Fix successful. |
rustbot
added
the
A-translation
Collaborator
|
cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki |
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. |
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.