Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the E0252 error message to use better names for things.
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.
- Loading branch information
Nick Hamann
committed
Jun 18, 2015
1 parent
0250ff9
commit b637f6b
Showing
2 changed files
with
51 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use foo::baz; | ||
use bar::baz; //~ ERROR a module named `baz` has already been imported | ||
|
||
use foo::Quux; | ||
use bar::Quux; //~ ERROR a trait named `Quux` has already been imported | ||
|
||
use foo::blah; | ||
use bar::blah; //~ ERROR a type named `blah` has already been imported | ||
|
||
use foo::WOMP; | ||
use bar::WOMP; //~ ERROR a value named `WOMP` has already been imported | ||
|
||
fn main() {} | ||
|
||
mod foo { | ||
pub mod baz {} | ||
pub trait Quux { } | ||
pub type blah = (f64, u32); | ||
pub const WOMP: u8 = 5; | ||
} | ||
|
||
mod bar { | ||
pub mod baz {} | ||
pub type Quux = i32; | ||
struct blah { x: i8 } | ||
pub const WOMP: i8 = -5; | ||
} |