Handle more span edge cases in generics diagnostics#83759
Merged
bors merged 5 commits intorust-lang:masterfrom May 13, 2021
Merged
Handle more span edge cases in generics diagnostics#83759bors merged 5 commits intorust-lang:masterfrom
bors merged 5 commits intorust-lang:masterfrom
Conversation
SkiFire13
force-pushed
the
fix-diag
branch
2 times, most recently
from
776cc42 to
3a7c076
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Member
|
@Dylan-DPC this is missing an assignee |
|
r? @estebank |
crlf0710
added
the
S-waiting-on-review
JohnCSimon
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #85150) made this pull request unmergeable. Please resolve the merge conflicts. |
SkiFire13
force-pushed
the
fix-diag
branch
2 times, most recently
from
105f916 to
c1c6d8f
Compare
Collaborator
|
☔ The latest upstream changes (presumably #82272) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
@SkiFire13 apologies for the delay and the significant divergence introduced by #82272. That PR touches a lot of code that affects the same output you were trying to improve. Would you be interested in trying to port your changes to the new approach? |
Contributor
Author
|
Don't worry, I feel like if my PR would have been merged before it would have been harder to rebase #82272. I'm currently working on rebasing it. |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 7f5ad61 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 20, 2021
Fix missing lifetimes diagnostics after rust-lang#83759 In rust-lang#83759 while rebasing I didn't realize there was a new function for suggesting to add lifetime arguments. It relied on some invariants, namely that if a generic type/trait has angle brackets then it must have some generic argument, which is now no longer true. This PR updates that function to handle the new invariants. This also adds a new regression test but I'm not sure if that's the correct place for it. Fixes rust-lang#85347
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 20, 2021
…laumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#85275 (Move `std::memchr` to `sys_common`) - rust-lang#85326 (bootstrap: ensure host std when cross-compiling tools, fixes rust-lang#85320) - rust-lang#85375 (Fix missing lifetimes diagnostics after rust-lang#83759) - rust-lang#85507 (Extend escape key check) - rust-lang#85509 (Prevent tab title to "null" if the URL is a search one) 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
9 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.
This should fix invalid suggestions that didn't account for empty bracket pairs (
<>) or type bindings.