Skip to content

Fix error message for E0256 in certain cases. #26358

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

Merged
merged 1 commit into from
Jun 18, 2015
Merged

Conversation

nham
Copy link
Contributor

@nham nham commented Jun 17, 2015

Previously, it said "import Foo conflicts with existing submodule" even
when it was a type alias, enum, or trait. The message now says the conflict
is with "type in this module" in the case of the first two, and "trait in
this module" for the last one.

Fixes #24081.

Previously, it said "import `Foo` conflicts with existing submodule" even
when it was a type alias, enum, or trait. The message now says the conflict
is with "type in this module" in the case of the first two, and "trait in
this module" for the last one.

Fixes rust-lang#24081.
@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@alexcrichton
Copy link
Member

@bors: r+ 0c22cd7

Thanks!

@bors
Copy link
Collaborator

bors commented Jun 18, 2015

⌛ Testing commit 0c22cd7 with merge 9656fa2...

@bors
Copy link
Collaborator

bors commented Jun 18, 2015

💔 Test failed - auto-linux-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Jun 18, 2015 at 12:19 AM, bors [email protected] wrote:

[image: 💔] Test failed - auto-linux-32-nopt-t
http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/5407


Reply to this email directly or view it on GitHub
#26358 (comment).

@bors
Copy link
Collaborator

bors commented Jun 18, 2015

⌛ Testing commit 0c22cd7 with merge 1ef14d9...

bors added a commit that referenced this pull request Jun 18, 2015
Previously, it said "import `Foo` conflicts with existing submodule" even
when it was a type alias, enum, or trait. The message now says the conflict
is with "type in this module" in the case of the first two, and "trait in
this module" for the last one.

Fixes #24081.
@bors bors merged commit 0c22cd7 into rust-lang:master Jun 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants