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

Compare primary with maximum of childrens' line num instead of dropping it #65010

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Compare primary with maximum of childrens' line num instead of dropping it #65010

merged 1 commit into from
Oct 3, 2019

Conversation

AnthonyMikh
Copy link
Contributor

@AnthonyMikh AnthonyMikh commented Oct 2, 2019

Fix #65001.

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

(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 Oct 2, 2019
@AnthonyMikh
Copy link
Contributor Author

r? @estebank

@rust-highfive rust-highfive assigned estebank and unassigned zackmdavis Oct 2, 2019
@estebank
Copy link
Contributor

estebank commented Oct 2, 2019

r=me, but can you verify locally that it is doing the right thing? We cannot test for this output sadly due to the line number anonymization we perform on all stderr tests.

@AnthonyMikh
Copy link
Contributor Author

I'm sorry, I can't test it localy, rustc would take forever to build on my machine. However, now the code behaves just like before the commit, so functionality should be fixed.

@estebank
Copy link
Contributor

estebank commented Oct 2, 2019

Confirmed locally.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit df203a2 has been approved by estebank

@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 Oct 2, 2019
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 2, 2019
Compare `primary` with maximum of `children`s' line num instead of dropping it

Fix rust-lang#65001.
Centril added a commit to Centril/rust that referenced this pull request Oct 2, 2019
Compare `primary` with maximum of `children`s' line num instead of dropping it

Fix rust-lang#65001.
Centril added a commit to Centril/rust that referenced this pull request Oct 3, 2019
Compare `primary` with maximum of `children`s' line num instead of dropping it

Fix rust-lang#65001.
bors added a commit that referenced this pull request Oct 3, 2019
Rollup of 7 pull requests

Successful merges:

 - #63678 (Improve HRTB error span when -Zno-leak-check is used)
 - #64931 (Reword E0392 slightly)
 - #64959 (syntax: improve parameter without type suggestions)
 - #64975 (Implement Clone::clone_from for LinkedList)
 - #64993 (BacktraceStatus: add Eq impl)
 - #64998 (Filter out RLS output directories on tidy runs)
 - #65010 (Compare `primary` with maximum of `children`s' line num instead of dropping it)

Failed merges:

r? @ghost
@bors bors merged commit df203a2 into rust-lang:master Oct 3, 2019
@AnthonyMikh AnthonyMikh deleted the fix_65001 branch October 3, 2019 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Regression in spacing of left margin in diagnostics
5 participants