Auto merge of #252 - est31:master, r=cuviper

macros 1.1 is now stable

Fixes #251. Also includes a patch to get the tests working again.

derive/Cargo.toml

@@ -14,7 +14,7 @@ quote = "0.1.3"
 syn = "0.7.0"
 
 [dev-dependencies]
-compiletest_rs = "0.2.2"
+compiletest_rs = "0.2.5"
 
 [dev-dependencies.num]
 path = ".."

derive/src/lib.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![crate_type = "proc-macro"]
-#![feature(proc_macro, proc_macro_lib)]
 
 extern crate syn;
 #[macro_use]

derive/tests/compile-fail/derive_on_struct.rs

@@ -1,4 +1,3 @@
-
 // Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
@@ -9,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(proc_macro)]
-
 extern crate num;
 #[macro_use]
 extern crate num_derive;

derive/tests/compile-fail/enum_with_associated_data.rs

@@ -1,4 +1,3 @@
-
 // Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
@@ -9,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(proc_macro)]
-
 extern crate num;
 #[macro_use]
 extern crate num_derive;

derive/tests/empty_enum.rs

@@ -1,4 +1,3 @@
-
 // Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
@@ -9,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(proc_macro)]
-
 extern crate num;
 #[macro_use]
 extern crate num_derive;

derive/tests/trivial.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(proc_macro)]
-
 extern crate num;
 #[macro_use]
 extern crate num_derive;

derive/tests/with_custom_values.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(proc_macro)]
-
 extern crate num;
 #[macro_use]
 extern crate num_derive;