diff options
| author | bors <bors@rust-lang.org> | 2015-06-18 10:30:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-18 10:30:46 +0000 |
| commit | 1ef14d94113d212384e0823cb98b7260bc7fd392 (patch) | |
| tree | 4f648b25100efa3e2d27a0bf85f067f5ccc7353c /src/rustllvm/RustWrapper.cpp | |
| parent | 941af7be24a5c54fd24ba9f0276b97d2c3b53748 (diff) | |
| parent | 0c22cd79066f59500eae430abb26b9738d105b99 (diff) | |
| download | rust-1ef14d94113d212384e0823cb98b7260bc7fd392.tar.gz rust-1ef14d94113d212384e0823cb98b7260bc7fd392.zip | |
Auto merge of #26358 - nham:fix_24081, r=alexcrichton
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.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions