rustc: Don't allow empty link_name when nolink attribute is present

Closes #1326

src/comp/metadata/creader.rs

@@ -57,17 +57,20 @@ fn visit_item(e: env, i: @ast::item) {
         }
 
         let cstore = e.sess.get_cstore();
-        let native_name = i.ident;
+        let native_name =
+            alt attr::get_meta_item_value_str_by_name(i.attrs, "link_name") {
+              some(nn) {
+                if nn == "" {
+                    e.sess.span_fatal(
+                        i.span,
+                        "empty #[link_name] not allowed; use #[nolink].");
+                }
+                nn
+              }
+              none. { i.ident }
+            };
         let already_added = false;
         if vec::len(attr::find_attrs_by_name(i.attrs, "nolink")) == 0u {
-            alt attr::get_meta_item_value_str_by_name(i.attrs, "link_name") {
-              some(nn) { native_name = nn; }
-              none. { }
-            }
-            if native_name == "" {
-                e.sess.span_fatal(i.span,
-                    "empty #[link_name] not allowed; use #[nolink].");
-            }
             already_added = !cstore::add_used_library(cstore, native_name);
         }
         let link_args = attr::find_attrs_by_name(i.attrs, "link_args");

src/libstd/freebsd_os.rs

@@ -24,7 +24,6 @@
 // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
 // by https://github.com/graydon/rust/issues#issue/268
 
-#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
 #[nolink]
 #[abi = "cdecl"]
 native mod libc {

src/libstd/linux_os.rs

@@ -24,7 +24,6 @@
 // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
 // by https://github.com/graydon/rust/issues#issue/268
 
-#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
 #[nolink]
 #[abi = "cdecl"]
 native mod libc {

src/libstd/macos_os.rs

@@ -18,7 +18,6 @@
 // FIXME Refactor into unix_os module or some such. Doesn't
 // seem to work right now.
 
-#[link_name = ""] // FIXME: Remove after snapshotting
 #[nolink]
 #[abi = "cdecl"]
 native mod libc {

src/libstd/win32_os.rs

@@ -2,7 +2,6 @@
 import core::ctypes::*;
 
 #[abi = "cdecl"]
-#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
 #[nolink]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;

src/test/compile-fail/empty-linkname2.rs

+// error-pattern:empty #[link_name] not allowed; use #[nolink].
+// Issue #1326
+
+#[link_name = ""]
+#[nolink]
+native mod foo {
+}