Skip to content

Commit f0ff2d3

Browse files
committed
E0403 update error format
1 parent 514d4ce commit f0ff2d3

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

src/librustc_resolve/lib.rs

+18-12
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ enum ResolutionError<'a> {
103103
/// error E0402: cannot use an outer type parameter in this context
104104
OuterTypeParameterContext,
105105
/// error E0403: the name is already used for a type parameter in this type parameter list
106-
NameAlreadyUsedInTypeParameterList(Name),
106+
NameAlreadyUsedInTypeParameterList(Name, &'a Span),
107107
/// error E0404: is not a trait
108108
IsNotATrait(&'a str),
109109
/// error E0405: use of undeclared trait name
@@ -210,13 +210,17 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
210210
E0402,
211211
"cannot use an outer type parameter in this context")
212212
}
213-
ResolutionError::NameAlreadyUsedInTypeParameterList(name) => {
214-
struct_span_err!(resolver.session,
215-
span,
216-
E0403,
217-
"the name `{}` is already used for a type parameter in this type \
218-
parameter list",
219-
name)
213+
ResolutionError::NameAlreadyUsedInTypeParameterList(name, first_use_span) => {
214+
let mut err = struct_span_err!(resolver.session,
215+
span,
216+
E0403,
217+
"the name `{}` is already used for a type parameter \
218+
in this type parameter list",
219+
name);
220+
err.span_label(span, &format!("already used"));
221+
err.span_label(first_use_span.clone(), &format!("first use of `{}`", name));
222+
err
223+
220224
}
221225
ResolutionError::IsNotATrait(name) => {
222226
let mut err = struct_span_err!(resolver.session,
@@ -1731,17 +1735,19 @@ impl<'a> Resolver<'a> {
17311735
match type_parameters {
17321736
HasTypeParameters(generics, space, rib_kind) => {
17331737
let mut function_type_rib = Rib::new(rib_kind);
1734-
let mut seen_bindings = HashSet::new();
1738+
let mut seen_bindings = HashMap::new();
17351739
for (index, type_parameter) in generics.ty_params.iter().enumerate() {
17361740
let name = type_parameter.ident.name;
17371741
debug!("with_type_parameter_rib: {}", type_parameter.id);
17381742

1739-
if seen_bindings.contains(&name) {
1743+
if seen_bindings.contains_key(&name) {
1744+
let span = seen_bindings.get(&name).unwrap();
17401745
resolve_error(self,
17411746
type_parameter.span,
1742-
ResolutionError::NameAlreadyUsedInTypeParameterList(name));
1747+
ResolutionError::NameAlreadyUsedInTypeParameterList(name,
1748+
span));
17431749
}
1744-
seen_bindings.insert(name);
1750+
seen_bindings.entry(name).or_insert(type_parameter.span);
17451751

17461752
// plain insert (no renaming)
17471753
let def_id = self.definitions.local_def_id(type_parameter.id);

src/test/compile-fail/E0403.rs

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// except according to those terms.
1010

1111
fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
12+
//~| NOTE already used
13+
//~| NOTE first use of `T`
1214

1315
fn main() {
1416
}

0 commit comments

Comments
 (0)