---

yaml
---
r: 47773
b: refs/heads/incoming
c: df4273f
h: refs/heads/master
i:
  47771: dff6994
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 99c4de73001e2f85a00c819fc208b31e93808480
+refs/heads/incoming: df4273f8742b2305632916091c2af77128a6e4bf
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/rust.md

@@ -549,7 +549,7 @@ This requirement most often affects name-designator pairs when they occur at the
 
 * `log_syntax!` : print out the arguments at compile time
 * `trace_macros!` : supply `true` or `false` to enable or disable printing of the macro expansion process.
-* `stringify!` : turn the identifier argument into a string literal
+* `ident_to_str!` : turn the identifier argument into a string literal
 * `concat_idents!` : create a new identifier by concatenating the arguments
 
 

branches/incoming/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) => {
@@ -181,7 +196,7 @@ fn visit_item(e: @mut Env, i: @ast::item) {
         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));
+                cstore::add_used_link_args(cstore, *linkarg);
               }
               None => {/* fallthrough */ }
             }

branches/incoming/src/librustc/metadata/cstore.rs

@@ -119,7 +119,7 @@ pub fn get_used_libraries(cstore: @mut CStore) -> ~[~str] {
     return /*bad*/copy cstore.used_libraries;
 }
 
-pub fn add_used_link_args(cstore: @mut CStore, args: ~str) {
+pub fn add_used_link_args(cstore: @mut CStore, args: &str) {
     cstore.used_link_args.push_all(str::split_char(args, ' '));
 }