about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2014-02-28 18:04:40 -0800
committerPatrick Walton <pcwalton@mimiga.net>2014-03-01 22:40:53 -0800
commit355932407ba324d33cd9353a69203f7f76c059a6 (patch)
tree8695509abdf59826b7efb0e711e723f299359648
parent0c6622aa0f36faff87840f94083abab0bf58d074 (diff)
downloadrust-355932407ba324d33cd9353a69203f7f76c059a6.tar.gz
rust-355932407ba324d33cd9353a69203f7f76c059a6.zip
libfourcc: Fix errors arising from the automated `~[T]` conversion
-rw-r--r--src/libfourcc/lib.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs
index 270416305dd..c465c8f1e16 100644
--- a/src/libfourcc/lib.rs
+++ b/src/libfourcc/lib.rs
@@ -131,7 +131,11 @@ struct Ident {
 }
 
 fn parse_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> (@ast::Expr, Option<Ident>) {
-    let p = &mut parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_owned());
+    let p = &mut parse::new_parser_from_tts(cx.parse_sess(),
+                                            cx.cfg(),
+                                            tts.iter()
+                                               .map(|x| (*x).clone())
+                                               .collect());
     let ex = p.parse_expr();
     let id = if p.token == token::EOF {
         None
@@ -151,7 +155,7 @@ fn parse_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> (@ast::Expr, Option<Ident>
 fn target_endian_little(cx: &ExtCtxt, sp: Span) -> bool {
     let meta = cx.meta_name_value(sp, InternedString::new("target_endian"),
         ast::LitStr(InternedString::new("little"), ast::CookedStr));
-    contains(cx.cfg(), meta)
+    contains(cx.cfg().as_slice(), meta)
 }
 
 // FIXME (10872): This is required to prevent an LLVM assert on Windows