Skip to content

Commit 97c043b

Browse files
committed
auto merge of #19114 : frewsxcv/rust/master, r=bstrie
Fixes #19010
2 parents f530aa0 + ef5acff commit 97c043b

File tree

4 files changed

+130
-129
lines changed

4 files changed

+130
-129
lines changed

AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Cole Mickens <[email protected]>
121121
Colin Davidson <[email protected]>
122122
Colin Sherratt <[email protected]>
123123
Conrad Kleinespel <[email protected]>
124+
Corey Farwell <[email protected]>
124125
Corey Ford <[email protected]>
125126
Corey Richardson <[email protected]>
126127

src/librustc_back/target/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl Target {
250250
} );
251251
($key_name:ident, list) => ( {
252252
let name = (stringify!($key_name)).replace("_", "-");
253-
obj.find(name[]).map(|o| o.as_list()
253+
obj.find(name[]).map(|o| o.as_array()
254254
.map(|v| base.options.$key_name = v.iter()
255255
.map(|a| a.as_string().unwrap().to_string()).collect()
256256
)

0 commit comments

Comments
 (0)