Skip to content

Commit 8fdc531

Browse files
author
Knight
committed
Updated E0423 to new format
1 parent a4c6307 commit 8fdc531

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/librustc_resolve/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,14 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
336336
err
337337
}
338338
ResolutionError::StructVariantUsedAsFunction(path_name) => {
339-
struct_span_err!(resolver.session,
339+
let mut err = struct_span_err!(resolver.session,
340340
span,
341341
E0423,
342342
"`{}` is the name of a struct or struct variant, but this expression \
343343
uses it like a function name",
344-
path_name)
344+
path_name);
345+
err.span_label(span, &format!("struct called like a function"));
346+
err
345347
}
346348
ResolutionError::SelfNotAvailableInStaticMethod => {
347349
struct_span_err!(resolver.session,

src/test/compile-fail/E0423.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ fn main () {
1212
struct Foo { a: bool };
1313

1414
let f = Foo(); //~ ERROR E0423
15+
//~^ struct called like a function
1516
}

src/test/compile-fail/issue-18252.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ enum Foo {
1313
}
1414

1515
fn main() {
16-
let f = Foo::Variant(42); //~ ERROR uses it like a function
16+
let f = Foo::Variant(42);
17+
//~^ ERROR uses it like a function
18+
//~| struct called like a function
1719
}

src/test/compile-fail/issue-19452.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ enum Homura {
1313
}
1414

1515
fn main() {
16-
let homura = Homura::Madoka; //~ ERROR uses it like a function
16+
let homura = Homura::Madoka;
17+
//~^ ERROR uses it like a function
18+
//~| struct called like a function
1719
}

0 commit comments

Comments
 (0)