commit d9a0994401ba2735b5f353dcaed29f7bbe1f8e55
author Alex Crichton <alex@alexcrichton.com> Sun Feb 15 10:26:39 2015 -0600
committer Alex Crichton <alex@alexcrichton.com> Sun Feb 15 10:26:39 2015 -0600
tree 921ff36ff171eda40abab603116d9e5b3261977a
parent f302e1e23fb38dd7755b8e5c2be3627c592e008a
parent 7996ee09c59e84315bb7540eba00135be01108d2

Merge pull request #16 from bobakker/master

Update to rust master

rand_macros/src/lib.rs

diff --git a/rand_macros/src/lib.rs b/rand_macros/src/lib.rs
index 4537dc1..87cdc39 100644
--- a/rand_macros/src/lib.rs
+++ b/rand_macros/src/lib.rs
@@ -58,7 +58,7 @@
                     Ptr(Box::new(Literal(Path::new_local("R"))),
                         Borrowed(None, ast::MutMutable))
                 ),
-                ret_ty: Self,
+                ret_ty: Self_,
                 attributes: Vec::new(),
                 combine_substructure: combine_substructure(Box::new(|a, b, c| {
                     rand_substructure(a, b, c)

tests/rand_macros.rs

diff --git a/tests/rand_macros.rs b/tests/rand_macros.rs
index bd7977c..3d51900 100755
--- a/tests/rand_macros.rs
+++ b/tests/rand_macros.rs
@@ -1,5 +1,5 @@
 #![allow(dead_code)]
-#![feature(plugin, core)]
+#![feature(plugin)]
 #![plugin(rand_macros)]
 
 extern crate rand;