]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a13b93 b637f6b)
Auto merge of #26385 - nham:fix_25396, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 18 Jun 2015 16:17:04 +0000 (16:17 +0000)
committerbors <bors@rust-lang.org>
Thu, 18 Jun 2015 16:17:04 +0000 (16:17 +0000)
commitf4518127636e6bffab0599ab4dad785a873c5bd8
tree346ab80c0f329137c273f5252d1d1282ea748095tree | snapshot
parent7a13b93b00af4e8f8b3baae2926e9877f5f6403dcommit | diff
parentb637f6b1bdee12e0cf18bd8fefbebe058518726fcommit | diff
Auto merge of #26385 - nham:fix_25396, r=alexcrichton

Currently in the E0252 message, traits and modules are all called types (as in "a type named `Foo` has already been imported", even when `Foo` was a trait or module). This commit changes that to additionally detect when the import in question is a trait or module and report it accordingly.

Fixes #25396.
src/librustc_resolve/resolve_imports.rs diff1 | diff2 | blob | history
Empowering everyone to build reliable and efficient software.