---

yaml
---
r: 44110
b: refs/heads/snap-stage3
c: 19eb225
h: refs/heads/master
v: v3

Author: z0w0

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fe9f1d155ab674e402cdb1b530df8ecb66bb7dd4
+refs/heads/snap-stage3: 19eb225bc2725202c02e3d520876bab25dc026d1
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/back/link.rs

@@ -497,7 +497,8 @@ pub fn build_link_meta(sess: Session, c: &ast::crate, output: &Path,
 
         let cmh_items = attr::sort_meta_items(cmh_items);
 
-        fn hash(symbol_hasher: &hash::State, m: &@ast::meta_item) {
+        symbol_hasher.reset();
+        for cmh_items.each |m| {
             match m.node {
               ast::meta_name_value(ref key, value) => {
                 symbol_hasher.write_str(len_and_str((*key)));
@@ -506,20 +507,13 @@ pub fn build_link_meta(sess: Session, c: &ast::crate, output: &Path,
               ast::meta_word(ref name) => {
                 symbol_hasher.write_str(len_and_str((*name)));
               }
-              ast::meta_list(ref name, ref mis) => {
-                symbol_hasher.write_str(len_and_str((*name)));
-                for mis.each |m_| {
-                    hash(symbol_hasher, m_);
-                }
+              ast::meta_list(_, _) => {
+                // FIXME (#607): Implement this
+                fail!(~"unimplemented meta_item variant");
               }
             }
         }
 
-        symbol_hasher.reset();
-        for cmh_items.each |m| {
-            hash(symbol_hasher, m);
-        }
-
         for dep_hashes.each |dh| {
             symbol_hasher.write_str(len_and_str(*dh));
         }

branches/snap-stage3/src/librustc/metadata/creader.rs

@@ -55,6 +55,7 @@ pub fn read_crates(diag: span_handler,
             visit_view_item: |a| visit_view_item(e, a),
             visit_item: |a| visit_item(e, a),
             .. *visit::default_simple_visitor()});
+    visit_crate(e, crate);
     visit::visit_crate(crate, (), v);
     dump_crates(e.crate_cache);
     warn_if_multiple_versions(e, diag, e.crate_cache);
@@ -125,6 +126,20 @@ struct Env {
     intr: @ident_interner
 }
 
+fn visit_crate(e: @mut Env, c: ast::crate) {
+    let cstore = e.cstore;
+    let link_args = attr::find_attrs_by_name(c.node.attrs, "link_args");
+
+    for link_args.each |a| {
+        match attr::get_meta_item_value_str(attr::attr_meta(*a)) {
+          Some(ref linkarg) => {
+            cstore::add_used_link_args(cstore, (/*bad*/copy *linkarg));
+          }
+          None => {/* fallthrough */ }
+        }
+    }
+}
+
 fn visit_view_item(e: @mut Env, i: @ast::view_item) {
     match /*bad*/copy i.node {
       ast::view_item_use(ident, meta_items, id) => {

branches/snap-stage3/src/libsyntax/attr.rs

@@ -192,15 +192,13 @@ fn eq(a: @ast::meta_item, b: @ast::meta_item) -> bool {
             }
             _ => false
           },
-          ast::meta_list(ref na, misa) => match b.node {
-            ast::meta_list(ref nb, misb) => {
-                if na != nb { return false; }
-                for misa.each |&mi| {
-                    if !contains(misb, mi) { return false; }
-                }
-                true
-            }
-            _ => false
+          ast::meta_list(*) => {
+
+            // ~[Fixme-sorting]
+            // FIXME (#607): Needs implementing
+            // This involves probably sorting the list by name and
+            // meta_item variant
+            fail!(~"unimplemented meta_item variant")
           }
         }
 }
@@ -255,6 +253,8 @@ pub fn last_meta_item_list_by_name(items: ~[@ast::meta_item], name: ~str)
 
 /* Higher-level applications */
 
+// FIXME (#607): This needs to sort by meta_item variant in addition to
+// the item name (See [Fixme-sorting])
 pub fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] {
     pure fn lteq(ma: &@ast::meta_item, mb: &@ast::meta_item) -> bool {
         pure fn key(m: &ast::meta_item) -> ~str {
@@ -270,17 +270,7 @@ pub fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] {
     // This is sort of stupid here, converting to a vec of mutables and back
     let mut v: ~[@ast::meta_item] = items;
     std::sort::quick_sort(v, lteq);
-
-    // There doesn't seem to be a more optimal way to do this
-    do v.map |&m| {
-        match m.node {
-          ast::meta_list(n, mis) => @spanned {
-              node: ast::meta_list(n, sort_meta_items(mis)),
-              .. *m
-          },
-          _ => m
-        }
-    }
+    v
 }
 
 pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: ~str) ->