mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #36070 - gavinb:master, r=jonathandturner

Browse source 
Update error format for E0458, E0459

Fixes #35933, #35932
Part of #35233

r? @jonathandturner
This commit is contained in:
Manish Goregaokar 2016-09-04 07:52:35 +05:30
commit 4b889154e1
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_metadata/creader.rs
View file

@ -1056,8 +1056,9 @@ impl<'a> LocalCrateReader<'a> {
Some("dylib") => cstore::NativeUnknown,
Some("framework") => cstore::NativeFramework,
Some(k) => {
span_err!(self.sess, m.span, E0458,
"unknown kind: `{}`", k);
struct_span_err!(self.sess, m.span, E0458,
"unknown kind: `{}`", k)
.span_label(m.span, &format!("unknown kind")).emit();
cstore::NativeUnknown
}
None => cstore::NativeUnknown
@ -1068,8 +1069,9 @@ impl<'a> LocalCrateReader<'a> {
let n = match n {
Some(n) => n,
None => {
span_err!(self.sess, m.span, E0459,
"#[link(...)] specified without `name = \"foo\"`");
struct_span_err!(self.sess, m.span, E0459,
"#[link(...)] specified without `name = \"foo\"`")
.span_label(m.span, &format!("missing `name` argument")).emit();
InternedString::new("foo")
}
};

4
src/test/compile-fail/E0458.rs
View file

@ -9,7 +9,9 @@
// except according to those terms.
#[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
//~^ ERROR E0459
//~| NOTE unknown kind
//~| ERROR E0459
//~| NOTE missing `name` argument
fn main() {
}

1
src/test/compile-fail/E0459.rs
View file

@ -9,6 +9,7 @@
// except according to those terms.
#[link(kind = "dylib")] extern {} //~ ERROR E0459
//~| NOTE missing `name` argument
fn main() {
}