Swap primary/secondary spans for E0458

Author: estebank

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
                         }
                     };

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
 

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