diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2019-03-10 18:03:59 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2019-03-23 13:05:30 -0700 |
| commit | e1be8b0318b6f5647ff385dce75e9eb8e958c116 (patch) | |
| tree | 29dcc330681f36b85739bf4f7c8922f892982fd8 | |
| parent | 8e043950c8d8f8fa6df777a896286e0768f73b4a (diff) | |
| download | rust-e1be8b0318b6f5647ff385dce75e9eb8e958c116.tar.gz rust-e1be8b0318b6f5647ff385dce75e9eb8e958c116.zip | |
Swap primary/secondary spans for E0458
| -rw-r--r-- | src/librustc_metadata/native_libs.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/bad/bad-extern-link-attrs.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0458.stderr | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs index 314c95a42be..cb1af932ce0 100644 --- a/src/librustc_metadata/native_libs.rs +++ b/src/librustc_metadata/native_libs.rs @@ -74,9 +74,10 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for Collector<'a, 'tcx> { "dylib" => cstore::NativeUnknown, "framework" => cstore::NativeFramework, k => { - struct_span_err!(self.tcx.sess, m.span, E0458, + struct_span_err!(self.tcx.sess, item.span, E0458, "unknown kind: `{}`", k) - .span_label(item.span(), "unknown kind").emit(); + .span_label(item.span(), "unknown kind") + .span_label(m.span, "").emit(); cstore::NativeUnknown } }; diff --git a/src/test/ui/bad/bad-extern-link-attrs.stderr b/src/test/ui/bad/bad-extern-link-attrs.stderr index 5baba599e74..a77f5f9f438 100644 --- a/src/test/ui/bad/bad-extern-link-attrs.stderr +++ b/src/test/ui/bad/bad-extern-link-attrs.stderr @@ -11,10 +11,10 @@ LL | #[link(name = "")] | ^^^^^^^^^^^^^^^^^^ empty name given error[E0458]: unknown kind: `bar` - --> $DIR/bad-extern-link-attrs.rs:4:1 + --> $DIR/bad-extern-link-attrs.rs:4:22 | LL | #[link(name = "foo", kind = "bar")] - | ^^^^^^^^^^^^^^^^^^^^^------------^^ + | ---------------------^^^^^^^^^^^^-- | | | unknown kind diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr index 9cfe7cccac1..154e0b12179 100644 --- a/src/test/ui/error-codes/E0458.stderr +++ b/src/test/ui/error-codes/E0458.stderr @@ -1,8 +1,8 @@ error[E0458]: unknown kind: `wonderful_unicorn` - --> $DIR/E0458.rs:1:1 + --> $DIR/E0458.rs:1:8 | LL | #[link(kind = "wonderful_unicorn")] extern {} - | ^^^^^^^--------------------------^^ + | -------^^^^^^^^^^^^^^^^^^^^^^^^^^-- | | | unknown kind |