Skip to content

Commit d6ceab6

Browse files
committed
---
yaml --- r: 149699 b: refs/heads/try2 c: 3559324 h: refs/heads/master i: 149697: 25379b9 149695: e8a5454 v: v3
1 parent 019b015 commit d6ceab6

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 0c6622aa0f36faff87840f94083abab0bf58d074
8+
refs/heads/try2: 355932407ba324d33cd9353a69203f7f76c059a6
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libfourcc/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ struct Ident {
131131
}
132132

133133
fn parse_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> (@ast::Expr, Option<Ident>) {
134-
let p = &mut parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_owned());
134+
let p = &mut parse::new_parser_from_tts(cx.parse_sess(),
135+
cx.cfg(),
136+
tts.iter()
137+
.map(|x| (*x).clone())
138+
.collect());
135139
let ex = p.parse_expr();
136140
let id = if p.token == token::EOF {
137141
None
@@ -151,7 +155,7 @@ fn parse_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> (@ast::Expr, Option<Ident>
151155
fn target_endian_little(cx: &ExtCtxt, sp: Span) -> bool {
152156
let meta = cx.meta_name_value(sp, InternedString::new("target_endian"),
153157
ast::LitStr(InternedString::new("little"), ast::CookedStr));
154-
contains(cx.cfg(), meta)
158+
contains(cx.cfg().as_slice(), meta)
155159
}
156160

157161
// FIXME (10872): This is required to prevent an LLVM assert on Windows

0 commit comments

Comments
 (0)