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

Underline multiple suggested replacements in the same line #50987

Merged
merged 3 commits into from
May 26, 2018
Merged

Underline multiple suggested replacements in the same line #50987

merged 3 commits into from
May 26, 2018

Conversation

estebank
Copy link
Contributor

screen shot 2018-05-22 at 21 06 48

Follow up to #50943.

Fix #50977.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 May 23, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me after updating UI tests

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2018
@estebank estebank force-pushed the underline-multiple-suggestions branch from f762def to d2ba7d9 Compare May 24, 2018 00:03
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented May 24, 2018

📌 Commit 536b177 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2018
@estebank
Copy link
Contributor Author

@bors rollup

@kennytm kennytm mentioned this pull request May 24, 2018
Merged
@kennytm
Copy link
Member

kennytm commented May 24, 2018

@bors r- rollup-

This PR conflicts with the just-merged #50943, please rebase.

[00:43:56] ---- [ui] ui/impl-trait/impl-generic-mismatch.rs stdout ----
[00:43:56] diff of stderr:
[00:43:56] 
[00:43:56] 9	help: try removing the generic parameter and using `impl Trait` instead
[00:43:56] 10	   |
[00:43:56] 11	LL |     fn foo(&self, _: &impl Debug) { }
[00:43:56] -	   |
[00:43:56] +	   |          --           ^^^^^^^^^^
[00:43:56] 13	
[00:43:56] 14	error[E0643]: method `bar` has incompatible signature for trait
[00:43:56] 15	  --> $DIR/impl-generic-mismatch.rs:27:23

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2018
estebank added 2 commits May 24, 2018 04:16
@estebank
Underline multiple suggested replacements in the same line
2daa013 
Follow up to rust-lang#50943.

Fix rust-lang#50977.
@estebank
Account for negative offsets in suggestions
50eefc0 
When suggesting code that has a shorter span than the current code,
account for this by keeping the offset as a signed value.
@estebank estebank force-pushed the underline-multiple-suggestions branch from 536b177 to 50eefc0 Compare May 24, 2018 11:17
@estebank

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2018
@estebank

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2018
@estebank

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2018
@estebank

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2018
@estebank
Copy link
Contributor Author

@bors r=petrochencov

@bors
Copy link
Contributor

bors commented May 24, 2018

📌 Commit 50eefc0 has been approved by petrochencov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2018
@estebank
Copy link
Contributor Author

@bors r=petrochencov

@bors
Copy link
Contributor

bors commented May 24, 2018

📌 Commit f36c643 has been approved by petrochencov

@estebank estebank mentioned this pull request May 26, 2018
Open
2 tasks
kennytm added a commit to kennytm/rust that referenced this pull request May 26, 2018
@kennytm
Rollup merge of rust-lang#50987 - estebank:underline-multiple-suggest…
103abdb 
…ions, r=petrochencov

Underline multiple suggested replacements in the same line

<img width="685" alt="screen shot 2018-05-22 at 21 06 48" src="https://user-images.githubusercontent.com/1606434/40403051-174f3180-5e04-11e8-86b6-261630c5ff80.png">

Follow up to rust-lang#50943.

Fix rust-lang#50977.
@kennytm kennytm mentioned this pull request May 26, 2018
Merged
bors added a commit that referenced this pull request May 26, 2018
@bors
Auto merge of #51082 - kennytm:rollup, r=kennytm
7a0e6a8 
Rollup of 11 pull requests

Successful merges:

 - #50987 (Underline multiple suggested replacements in the same line)
 - #51014 (Add documentation about env! second argument)
 - #51034 (Remove unused lowering field and method)
 - #51047 (Use AllFacts from polonius-engine)
 - #51048 (Add more missing examples for Formatter)
 - #51056 (Mention and use `Once::new` instead of `ONCE_INIT`)
 - #51059 (What does an expression look like, that consists only of special characters?)
 - #51065 (Update nomicon link in transmute docs)
 - #51067 (Add inner links in documentation)
 - #51070 (Fail typecheck if we encounter a bogus break)
 - #51073 (Rename TokenStream::empty to TokenStream::new)

Failed merges:
@bors bors merged commit f36c643 into rust-lang:master May 26, 2018
@estebank estebank deleted the underline-multiple-suggestions branch November 9, 2023 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

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.
5 participants
@estebank @rust-highfive @petrochenkov @bors @kennytm