Cleanup attribute code. Issue #487

Author: brson

src/comp/metadata/creader.rs

@@ -56,20 +56,24 @@ fn find_library_crate(&session::session sess, &ast::ident ident,
                       &vec[@ast::meta_item] metas,
                       &vec[str] library_search_paths) ->
    option::t[tup(str, vec[u8])] {
-    let str crate_name = ident;
-    for (@ast::meta_item mi in metas) {
-        alt (mi.node) {
-            case (ast::meta_name_value(?name, ?value)) {
-                if (name == "name") {
-                    crate_name = value;
-                    break;
+
+    auto crate_name = {
+        auto name_items = attr::find_meta_items_by_name(metas, "name");
+        alt (vec::last(name_items)) {
+            case (some(?i)) {
+                alt (i.node) {
+                    case (ast::meta_name_value(_, ?v)) { v }
+                    case (_) {
+                        // FIXME: Probably want a warning here since the user
+                        // is using the wrong type of meta item
+                        ident
+                    }
                 }
             }
-            case (_) {
-                // FIXME (#487)
-            }
+            case (none) { ident }
         }
-    }
+    };
+
     auto nn = default_native_lib_naming(sess);
     let str prefix = nn.prefix + crate_name;
     // FIXME: we could probably use a 'glob' function in std::fs but it will

src/comp/metadata/encoder.rs

@@ -415,7 +415,6 @@ fn write_int(&io::writer writer, &int n) {
 }
 
 fn encode_meta_item(&ebml::writer ebml_w, &meta_item mi) {
-    // FIXME (#487): Support all forms of meta item
     alt (mi.node) {
         case (meta_word(?name)) {
             ebml::start_tag(ebml_w, tag_meta_item_word);

src/comp/middle/attr.rs

@@ -7,6 +7,7 @@ import front::ast;
 export attr_metas;
 export find_linkage_metas;
 export find_attrs_by_name;
+export find_meta_items_by_name;
 export contains;
 export sort_meta_items;