auto merge of #19114 : frewsxcv/rust/master, r=bstrie

Fixes #19010
rust-lang · Nov 21, 2014 · 97c043b · 97c043b
2 parents f530aa0 + ef5acff
commit 97c043b
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 129 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -121,6 +121,7 @@ Cole Mickens <cole.mickens@gmail.com>
 Colin Davidson <colrdavidson@gmail.com>
 Colin Sherratt <colin.sherratt@gmail.com>
 Conrad Kleinespel <conradk@conradk.com>
+Corey Farwell <coreyf+rust@rwell.org>
 Corey Ford <corey@coreyford.name>
 Corey Richardson <corey@octayn.net>
 DJUrsus <colinvh@divitu.com>

diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
@@ -250,7 +250,7 @@ impl Target {
             } );
             ($key_name:ident, list) => ( {
                 let name = (stringify!($key_name)).replace("_", "-");
-                obj.find(name[]).map(|o| o.as_list()
+                obj.find(name[]).map(|o| o.as_array()
                     .map(|v| base.options.$key_name = v.iter()
                         .map(|a| a.as_string().unwrap().to_string()).collect()
                         )