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

Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans #59473

Merged
merged 6 commits into from
Mar 29, 2019
Merged

Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans #59473

merged 6 commits into from
Mar 29, 2019

Conversation

estebank
Copy link
Contributor

Fix #58298.

@estebank
Do not suggest borrowing when the span comes from a macro
0acb786
@estebank
Add test
925ca49
@estebank
Account for fully overlapping multiline annotations
326ec80 
When two multiline span labels point at the same span, we special
case the output to avoid weird behavior:

```
        foo(
   _____^
  |_____|
 ||         bar,
 ||     );
 ||      ^
 ||______|
  |______foo
         baz
```

instead showing

```
       foo(
  _____^
 |         bar,
 |     );
 |      ^
 |      |
 |______foo
        baz
```
@rust-highfive
Copy link
Collaborator

r? @eddyb

(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 Mar 28, 2019
@estebank
Copy link
Contributor Author

r? @davidtwco

@rust-highfive rust-highfive assigned davidtwco and unassigned eddyb Mar 28, 2019
davidtwco
davidtwco approved these changes Mar 28, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Left a few nits, LGTM otherwise.

src/librustc_errors/emitter.rs Outdated Show resolved Hide resolved
src/librustc_errors/emitter.rs Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 29, 2019

📌 Commit b5690c2 has been approved by davidtwco

@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 Mar 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 29, 2019
@Centril
Rollup merge of rust-lang#59473 - estebank:borrow-sugg-inside-macro, …
c105f34 
…r=davidtwco

Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans

Fix rust-lang#58298.
@Centril Centril mentioned this pull request Mar 29, 2019
Merged
bors added a commit that referenced this pull request Mar 29, 2019
@bors
Auto merge of #59522 - Centril:rollup, r=Centril
d920dfc 
Rollup of 9 pull requests

Successful merges:

 - #59366 (Update books)
 - #59436 (Update jemalloc-sys to version 0.3.0)
 - #59454 (Update rustfmt to 1.2.0)
 - #59462 (Fix error in Rust 2018 + no_core environment)
 - #59467 (Better diagnostic for binary operation on BoxedValues)
 - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans)
 - #59480 (Update stdsimd)
 - #59486 (Visit `ImplItem` in `dead_code` lint)
 - #59510 (Rename `type_parameters` to `generics` and so on)

Failed merges:

 - #59516 (Update cargo)

r? @ghost
bors added a commit that referenced this pull request Mar 29, 2019
@bors
Auto merge of #59522 - Centril:rollup, r=Centril
e782d79 
Rollup of 9 pull requests

Successful merges:

 - #59366 (Update books)
 - #59436 (Update jemalloc-sys to version 0.3.0)
 - #59454 (Update rustfmt to 1.2.0)
 - #59462 (Fix error in Rust 2018 + no_core environment)
 - #59467 (Better diagnostic for binary operation on BoxedValues)
 - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans)
 - #59480 (Update stdsimd)
 - #59486 (Visit `ImplItem` in `dead_code` lint)
 - #59510 (Rename `type_parameters` to `generics` and so on)

Failed merges:

 - #59516 (Update cargo)

r? @ghost
@bors bors merged commit b5690c2 into rust-lang:master Mar 29, 2019
@estebank estebank deleted the borrow-sugg-inside-macro branch November 9, 2023 05:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@estebank @rust-highfive @davidtwco @bors @eddyb