Skip to content

Commit 2e1669f

Browse files
authored
Rollup merge of rust-lang#36070 - gavinb:master, r=jonathandturner
Update error format for E0458, E0459 Fixes rust-lang#35933, rust-lang#35932 Part of rust-lang#35233 r? @jonathandturner
2 parents 70598e0 + 0412fa8 commit 2e1669f

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/librustc_metadata/creader.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,9 @@ impl<'a> LocalCrateReader<'a> {
10561056
Some("dylib") => cstore::NativeUnknown,
10571057
Some("framework") => cstore::NativeFramework,
10581058
Some(k) => {
1059-
span_err!(self.sess, m.span, E0458,
1060-
"unknown kind: `{}`", k);
1059+
struct_span_err!(self.sess, m.span, E0458,
1060+
"unknown kind: `{}`", k)
1061+
.span_label(m.span, &format!("unknown kind")).emit();
10611062
cstore::NativeUnknown
10621063
}
10631064
None => cstore::NativeUnknown
@@ -1068,8 +1069,9 @@ impl<'a> LocalCrateReader<'a> {
10681069
let n = match n {
10691070
Some(n) => n,
10701071
None => {
1071-
span_err!(self.sess, m.span, E0459,
1072-
"#[link(...)] specified without `name = \"foo\"`");
1072+
struct_span_err!(self.sess, m.span, E0459,
1073+
"#[link(...)] specified without `name = \"foo\"`")
1074+
.span_label(m.span, &format!("missing `name` argument")).emit();
10731075
InternedString::new("foo")
10741076
}
10751077
};

src/test/compile-fail/E0458.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
// except according to those terms.
1010

1111
#[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
12-
//~^ ERROR E0459
12+
//~| NOTE unknown kind
13+
//~| ERROR E0459
14+
//~| NOTE missing `name` argument
1315

1416
fn main() {
1517
}

src/test/compile-fail/E0459.rs

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

1111
#[link(kind = "dylib")] extern {} //~ ERROR E0459
12+
//~| NOTE missing `name` argument
1213

1314
fn main() {
1415
}

0 commit comments

Comments
 (0)