---

yaml
---
r: 29991
b: refs/heads/incoming
c: 1b804ce
h: refs/heads/master
i:
  29989: 5107b53
  29987: 0868e5a
  29983: 4775308
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0a5f88a2406bf78a216ea8e2128441766dd7cd9c
+refs/heads/incoming: 1b804ce343a79fec2b08b88740782c1e8c081417
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/attr.rs

@@ -297,25 +297,15 @@ fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: ~str) ->
     });
 }
 
-fn find_linkage_attrs(attrs: ~[ast::attribute]) -> ~[ast::attribute] {
-    let mut found = ~[];
-    for find_attrs_by_name(attrs, ~"link").each |attr| {
-        match attr.node.value.node {
-          ast::meta_list(_, _) => vec::push(found, attr),
-          _ => debug!{"ignoring link attribute that has incorrect type"}
-        }
-    }
-    return found;
-}
-
 /**
- * From a list of crate attributes get only the meta_items that impact crate
+ * From a list of crate attributes get only the meta_items that affect crate
  * linkage
  */
 fn find_linkage_metas(attrs: ~[ast::attribute]) -> ~[@ast::meta_item] {
-    do find_linkage_attrs(attrs).flat_map |attr| {
-        match check attr.node.value.node {
-          ast::meta_list(_, items) => /* FIXME (#2543) */ copy items
+    do find_attrs_by_name(attrs, ~"link").flat_map |attr| {
+        match attr.node.value.node {
+            ast::meta_list(_, items) => /* FIXME (#2543) */ copy items,
+            _ => ~[]
         }
     }
 }

branches/incoming/src/libsyntax/print/pprust.rs

@@ -117,10 +117,6 @@ fn item_to_str(i: @ast::item, intr: ident_interner) -> ~str {
     to_str(i, print_item, intr)
 }
 
-fn attr_to_str(i: ast::attribute, intr: ident_interner) -> ~str {
-    to_str(i, print_attribute, intr)
-}
-
 fn typarams_to_str(tps: ~[ast::ty_param], intr: ident_interner) -> ~str {
     to_str(tps, print_type_params, intr)
 }
@@ -165,8 +161,8 @@ fn block_to_str(blk: ast::blk, intr: ident_interner) -> ~str {
     io::mem_buffer_str(buffer)
 }
 
-fn meta_item_to_str(mi: ast::meta_item, intr: ident_interner) -> ~str {
-    to_str(@mi, print_meta_item, intr)
+fn meta_item_to_str(mi: @ast::meta_item, intr: ident_interner) -> ~str {
+    to_str(mi, print_meta_item, intr)
 }
 
 fn attribute_to_str(attr: ast::attribute, intr: ident_interner) -> ~str {

branches/incoming/src/rustc/metadata/decoder.rs

@@ -823,7 +823,7 @@ fn get_attributes(md: ebml::doc) -> ~[ast::attribute] {
 fn list_meta_items(intr: ident_interner,
                    meta_items: ebml::doc, out: io::Writer) {
     for get_meta_items(meta_items).each |mi| {
-        out.write_str(fmt!{"%s\n", pprust::meta_item_to_str(*mi, intr)});
+        out.write_str(fmt!{"%s\n", pprust::meta_item_to_str(mi, intr)});
     }
 }
 

branches/incoming/src/rustc/metadata/loader.rs

@@ -136,8 +136,9 @@ fn crate_name_from_metas(metas: ~[@ast::meta_item]) -> ~str {
 
 fn note_linkage_attrs(intr: ident_interner, diag: span_handler,
                       attrs: ~[ast::attribute]) {
-    for attr::find_linkage_attrs(attrs).each |attr| {
-        diag.handler().note(fmt!{"meta: %s", pprust::attr_to_str(attr,intr)});
+    for attr::find_linkage_metas(attrs).each |mi| {
+        diag.handler().note(fmt!{"meta: %s",
+              pprust::meta_item_to_str(mi,intr)});
     }
 }