about summary refs log tree commit diff
path: root/src/libsyntax/ext/auto_encode.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-01 20:35:55 -0800
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-01 20:35:55 -0800
commitaa3505d8ff043f0c1da62de4f517eed6defb6187 (patch)
treed0f82e2e5dd7b3dfeeb8b593ed0d76393e41ff05 /src/libsyntax/ext/auto_encode.rs
parent85fecd0ba77066e604cec9d3866b76edc626b5d3 (diff)
parent0fd1b58f236b4fe653d164836e94feebb2972931 (diff)
downloadrust-aa3505d8ff043f0c1da62de4f517eed6defb6187.tar.gz
rust-aa3505d8ff043f0c1da62de4f517eed6defb6187.zip
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libsyntax/ext/auto_encode.rs')
-rw-r--r--src/libsyntax/ext/auto_encode.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs
index 8cebe3cd187..0e2f3c2c856 100644
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -469,8 +469,8 @@ fn mk_impl(
     let ty = cx.ty_path(
         span,
         ~[ident],
-        generics.ty_params.map(
-            |tp| cx.ty_path(span, ~[tp.ident], ~[])).to_vec()
+        opt_vec::take_vec(generics.ty_params.map(
+            |tp| cx.ty_path(span, ~[tp.ident], ~[])))
     );
 
     let generics = ast::Generics {