Skip to content

Add suggestion for duplicated import. - #57973

Merged
bors merged 1 commit into
rust-lang:masterfrom
davidtwco:issue-52891
Feb 5, 2019
Merged

Add suggestion for duplicated import.#57973
bors merged 1 commit into
rust-lang:masterfrom
davidtwco:issue-52891

Conversation

@davidtwco

@davidtwcodavidtwco commented Jan 29, 2019

Copy link
Copy Markdown
Member

Fixes#52891.

This PR adds a suggestion when a import is duplicated (ie. the same name
is used twice trying to import the same thing) to remove the second
import.

@rust-highfive

rust-highfive commented Jan 29, 2019

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 29, 2019
davidtwco
davidtwco commented Jan 29, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-52891.rs Outdated
estebank
estebank requested changes Jan 29, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-19498.stderr Outdated
Comment threadsrc/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr Outdated
Comment threadsrc/test/ui/issues/issue-45829/import-self.stderr Outdated
Comment threadsrc/test/ui/issues/issue-45829/rename.stderr Outdated
Comment threadsrc/test/ui/issues/issue-56411.stderr Outdated
Comment threadsrc/test/ui/no-std-inject.stderr Outdated
Comment threadsrc/test/ui/proc-macro/shadow.stderr Outdated

@estebankestebankJan 29, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great behavior, although we probably should make sure we keep the #[macro_use] in the remaining extern statement... (not necessary in this PR)

@davidtwcodavidtwcoJan 30, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've changed this to prefer keeping imports with attributes.

@estebankestebankJan 31, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It didn't seem to work in this case, but only address if you have time.

@michaelwoerister

michaelwoerister commented Jan 30, 2019

Copy link
Copy Markdown
Member

r? @estebank if that's OK.

estebank
estebank reviewed Jan 30, 2019
View reviewed changes
Comment threadsrc/test/ui/use/use-mod.stderr Outdated
estebank
estebank approved these changes Jan 30, 2019
View reviewed changes

@estebankestebank left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, few nitpicks inline.

Comment threadsrc/test/ui/issues/issue-52891.stderr Outdated
Comment threadsrc/test/ui/issues/issue-45829/rename.stderr Outdated
Comment threadsrc/test/ui/issues/issue-45829/import-twice.stderr Outdated
Comment threadsrc/librustc_resolve/lib.rs Outdated
Comment threadsrc/librustc_resolve/lib.rs Outdated
@davidtwco
Add suggestion for duplicated import.
1595163
This commit adds a suggestion when a import is duplicated (ie. the same name
is used twice trying to import the same thing) to remove the second
import.
@estebank

estebank commented Jan 31, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1595163 has been approved by estebank

@borsbors 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 Jan 31, 2019
@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1595163 with merge 2e4c395588b3a70b13989656af07b08da2be208f...

@bors

This comment has been minimized.

Sign in to view
@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 1, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@davidtwco

davidtwco commented Feb 4, 2019

Copy link
Copy Markdown
MemberAuthor

@bors retry #55861

@borsbors 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 Feb 4, 2019
@bors

bors commented Feb 4, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1595163 with merge c6669166b92ff816adb807f6b4e87bcbfc37aa40...

@bors

bors commented Feb 4, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 4, 2019
@emilyalbini

emilyalbini commented Feb 4, 2019

Copy link
Copy Markdown
Member

Wut

@bors retry

@borsbors 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 Feb 4, 2019
@bors

bors commented Feb 5, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1595163 with merge b2c6b8c...

bors added a commit that referenced this pull request Feb 5, 2019
@bors
Auto merge of#57973- davidtwco:issue-52891, r=estebank
b2c6b8c
Add suggestion for duplicated import.
Fixes#52891.
This PR adds a suggestion when a import is duplicated (ie. the same name
is used twice trying to import the same thing) to remove the second
import.
@bors

bors commented Feb 5, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: estebank
Pushing b2c6b8c to master...

@bors
bors merged commit 1595163 into rust-lang:masterFeb 5, 2019
@davidtwco
davidtwco deleted the issue-52891 branch February 5, 2019 08:17
@borsbors mentioned this pull request Feb 5, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank approved these changes

Assignees

@estebankestebank

Labels

S-waiting-on-borsStatus: 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.

6 participants

@davidtwco@rust-highfive@michaelwoerister@estebank@bors@emilyalbini