[pull] master from proptest-rs:master

proptest-derive/src/ast.rs

@@ -106,8 +106,6 @@ impl Impl {
 
         let _top = call_site_ident(TOP_PARAM_NAME);
 
-        let _const = call_site_ident(&format!("_IMPL_ARBITRARY_FOR_{}", typ));
-
         // Linearise everything. We're done after this.
         //
         // NOTE: The clippy::arc_with_non_send_sync lint is disabled here because the strategies
@@ -118,7 +116,7 @@ impl Impl {
         let q = quote! {
             #[allow(non_upper_case_globals)]
             #[allow(clippy::arc_with_non_send_sync)]
-            const #_const: () = {
+            const _: () = {
             extern crate proptest as _proptest;
 
             impl #impl_generics _proptest::arbitrary::Arbitrary

proptest-derive/src/error.rs

@@ -505,10 +505,6 @@ error!(
      in Rust. An example: `#[proptest(params = \"ComplexType<Foo>\")]`."
 );
 
-// Happens when syn can't interpret <tts> in `#[proptest <tts>]`.
-error!(no_interp_meta, E0024,
-    "The tokens `<tts>` in #[proptest <tts>] do not make for a valid attribute.");
-
 // Happens when more than one of `#[proptest(strategy..)]`,
 // `#[proptest(value..)]`, or `#[proptest(regex..)]` were specified.
 // They are mutually exclusive choices.

proptest-derive/src/tests.rs

@@ -80,7 +80,7 @@ test! {
     } expands to {
         #[allow(non_upper_case_globals)]
         #[allow(clippy::arc_with_non_send_sync)]
-        const _IMPL_ARBITRARY_FOR_MyUnitStruct : () = {
+        const _: () = {
             extern crate proptest as _proptest;
         impl _proptest::arbitrary::Arbitrary for MyUnitStruct {
             type Parameters = ();
@@ -101,7 +101,7 @@ test! {
     } expands to {
         #[allow(non_upper_case_globals)]
         #[allow(clippy::arc_with_non_send_sync)]
-        const _IMPL_ARBITRARY_FOR_MyTupleUnitStruct : () = {
+        const _: () = {
             extern crate proptest as _proptest;
         impl _proptest::arbitrary::Arbitrary for MyTupleUnitStruct {
             type Parameters = ();
@@ -122,7 +122,7 @@ test! {
     } expands to {
         #[allow(non_upper_case_globals)]
         #[allow(clippy::arc_with_non_send_sync)]
-        const _IMPL_ARBITRARY_FOR_MyNamedUnitStruct : () = {
+        const _: () = {
             extern crate proptest as _proptest;
         impl _proptest::arbitrary::Arbitrary for MyNamedUnitStruct {
             type Parameters = ();

proptest-derive/tests/compile-fail/E0025-overspec-strat.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0026-strategy-malformed-expr.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0027-filter-malformed-expr.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
@@ -153,4 +154,4 @@ enum T19 {
     V1(
         u8,
     ),
-}
+}

proptest-derive/tests/compile-fail/E0027-filter-malformed.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
@@ -81,4 +82,4 @@ struct T8(u8);
 
 #[derive(Debug, Arbitrary)] //~ ERROR: [proptest_derive, E0027]
 #[proptest(filter(1))]
-struct T9(u8);
+struct T9(u8);

proptest-derive/tests/compile-fail/E0028-skipped-variant-has-filter.rs

@@ -8,10 +8,11 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
-#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors 
+#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors
                             //~| [proptest_derive, E0028]
                             //~| [proptest_derive, E0006]
 enum NonFatal {

proptest-derive/tests/compile-fail/E0028-skipped-variant-has-param.rs

@@ -8,10 +8,11 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
-#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors 
+#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors
                             //~| [proptest_derive, E0028]
                             //~| [proptest_derive, E0006]
 enum NonFatal {

proptest-derive/tests/compile-fail/E0028-skipped-variant-has-strat.rs

@@ -8,10 +8,11 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
-#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors 
+#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors
                             //~| [proptest_derive, E0028]
                             //~| [proptest_derive, E0006]
 enum NonFatal {

proptest-derive/tests/compile-fail/E0028-skipped-variant-has-weight.rs

@@ -8,10 +8,11 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
-#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors 
+#[derive(Debug, Arbitrary)] //~ ERROR: 2 errors
                             //~| [proptest_derive, E0028]
                             //~| [proptest_derive, E0006]
 enum NonFatal {

proptest-derive/tests/compile-fail/E0029-filter-on-unit-variant.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0029-params-on-unit-variant.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0029-strategy-on-unit-variant.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0030-params-on-unit-struct.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
@@ -51,4 +52,4 @@ struct T7();
 
 #[derive(Debug, Arbitrary)] //~ ERROR: [proptest_derive, E0030]
 #[proptest(filter(foo))]
-struct T8 {}
+struct T8 {}

proptest-derive/tests/compile-fail/E0031-no-bound-non-tyvar.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0032-no-bound-malformed.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0033-weight-overflow.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0034-regex-malformed.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0035-cant_set_param_and_regex.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/E0658-no-bare-modifiers.rs

@@ -13,6 +13,7 @@ extern crate proptest_derive;
 extern crate proptest;
 
 use proptest::prelude::*;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 

proptest-derive/tests/compile-fail/must-be-debug.rs

@@ -8,8 +8,13 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
+
 #[derive(Arbitrary)] //~ `Foo` doesn't implement `Debug` [E0277]
-struct Foo { x: usize } //~ `Foo` doesn't implement `Debug` [E0277]
+struct Foo { //~^ `Foo` doesn't implement `Debug` [E0277]
+             //~^ `Foo` doesn't implement `Debug` [E0277]
+    x: usize
+}

proptest-derive/tests/compile-fail/no-arbitrary.rs

@@ -8,10 +8,15 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
+#[derive(Debug)]
 struct T0;
 
 #[derive(Debug, Arbitrary)] //~ the trait bound `T0: Arbitrary` is not satisfied [E0277]
-struct T1 { f0: T0, } //~ the trait bound `T0: Arbitrary` is not satisfied [E0277]
+struct T1 {
+    f0: T0, //~ the trait bound `T0: Arbitrary` is not satisfied [E0277]
+            //~^ the trait bound `T0: Arbitrary` is not satisfied [E0277]
+}

proptest-derive/tests/compile-fail/regex_wrong_type.rs

@@ -8,6 +8,7 @@
 
 #[macro_use]
 extern crate proptest_derive;
+use proptest_derive::Arbitrary;
 
 fn main() {}
 
@@ -20,37 +21,37 @@ fn make_regex() -> &'static str {
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T0 {
     #[proptest(regex = "a+")]
-    f0: (),
+    f0: (), //~ StrategyFromRegex` is not satisfied [E0277]
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T1 {
     #[proptest(regex("a*"))]
-    f0: u8,
+    f0: u8, //~ StrategyFromRegex` is not satisfied [E0277]
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T2 {
     #[proptest(regex(make_regex))]
-    f0: Vec<u16>,
+    f0: Vec<u16>, //~ StrategyFromRegex` is not satisfied [E0277]
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T3(
     #[proptest(regex = "a+")]
-    (),
+    (), //~ StrategyFromRegex` is not satisfied [E0277]
 );
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T4(
     #[proptest(regex("a*"))]
-    u8,
+    u8, //~ StrategyFromRegex` is not satisfied [E0277]
 );
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 struct T5(
     #[proptest(regex(make_regex))]
-    Vec<u16>,
+    Vec<u16>, //~ StrategyFromRegex` is not satisfied [E0277]
 );
 
 // enum:
@@ -59,46 +60,46 @@ struct T5(
 enum T6 {
     V0 {
         #[proptest(regex = "a+")]
-        f0: (),
+        f0: (), //~ StrategyFromRegex` is not satisfied [E0277]
     }
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 enum T7 {
     V0 {
         #[proptest(regex("a*"))]
-        f0: u8,
+        f0: u8, //~ StrategyFromRegex` is not satisfied [E0277]
     }
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 enum T8 {
     V0 {
         #[proptest(regex(make_regex))]
-        f0: Vec<u16>,
+        f0: Vec<u16>, //~ StrategyFromRegex` is not satisfied [E0277]
     }
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 enum T9 {
     V0(
         #[proptest(regex = "a+")]
-        (),
+        (), //~ StrategyFromRegex` is not satisfied [E0277]
     )
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 enum T10 {
     V0(
         #[proptest(regex("a*"))]
-        u8,
+        u8, //~ StrategyFromRegex` is not satisfied [E0277]
     )
 }
 
 #[derive(Debug, Arbitrary)] //~ StrategyFromRegex` is not satisfied [E0277]
 enum T11 {
     V0(
         #[proptest(regex(make_regex))]
-        Vec<u16>,
+        Vec<u16>, //~ StrategyFromRegex` is not satisfied [E0277]
     )
 }

proptest-derive/tests/compiletest.rs

@@ -20,6 +20,7 @@ fn run_mode(src: &'static str, mode: &'static str) {
         config.filters = vec![name];
     }
     config.src_base = format!("tests/{}", src).into();
+    config.clean_rmeta();
 
     ct::run_tests(&config);
 }