2 Commits

Author	SHA1	Message	Date
Jeffrey Seyfried	b3c626547c	Fix fallout in tests	2016-03-16 08:52:33 +00:00
Nick Hamann	0c22cd7906	Fix error message for E0256 in certain cases. ... 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.	2015-06-16 18:55:52 -05:00