Add *Internal custom derive variants for juniper crate

Currently, custom derives inside the main juniper crate are supported by
an ugly hack using the __juniper_use_everything macro.

This commit adds new custom derive variants that are for
main juniper crate internal use only (GraphQL{Enum,InputObject}Internal.

All custom derives inside the juniper crate are refactored to use the
new '*Internal' derives.

This allows us to
* remove the use_everything macro,
* simplify the generated code for custom derives
* support the Rust 2018 edition

Author: theduke

juniper/src/executor_tests/enums.rs

@@ -7,7 +7,7 @@ use validation::RuleError;
 use value::{DefaultScalarValue, Object, Value};
 use GraphQLError::ValidationError;
 
-#[derive(GraphQLEnum, Debug)]
+#[derive(GraphQLEnumInternal, Debug)]
 enum Color {
     Red,
     Green,

juniper/src/executor_tests/introspection/enums.rs

@@ -15,41 +15,41 @@ Syntax to validate:
 
 */
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 enum DefaultName {
     Foo,
     Bar,
 }
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 #[graphql(name = "ANamedEnum")]
 enum Named {
     Foo,
     Bar,
 }
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 enum NoTrailingComma {
     Foo,
     Bar,
 }
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 #[graphql(description = "A description of the enum itself")]
 enum EnumDescription {
     Foo,
     Bar,
 }
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 enum EnumValueDescription {
     #[graphql(description = "The FOO value")]
     Foo,
     #[graphql(description = "The BAR value")]
     Bar,
 }
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 enum EnumDeprecation {
     #[graphql(deprecated = "Please don't use FOO any more")]
     Foo,

juniper/src/executor_tests/introspection/input_object.rs

@@ -6,47 +6,47 @@ use value::{DefaultScalarValue, Object, Value};
 
 struct Root;
 
-#[derive(GraphQLInputObject)]
+#[derive(GraphQLInputObjectInternal)]
 struct DefaultName {
     field_one: String,
     field_two: String,
 }
 
-#[derive(GraphQLInputObject)]
+#[derive(GraphQLInputObjectInternal)]
 struct NoTrailingComma {
     field_one: String,
     field_two: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 struct Derive {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(name = "ANamedInputObject")]
 struct Named {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(description = "Description for the input object")]
 struct Description {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 pub struct Public {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(description = "Description for the input object")]
 pub struct PublicWithDescription {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(
     name = "APublicNamedInputObjectWithDescription",
     description = "Description for the input object",
@@ -55,21 +55,21 @@ pub struct NamedPublicWithDescription {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(name = "APublicNamedInputObject")]
 pub struct NamedPublic {
     field_one: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 struct FieldDescription {
     #[graphql(description = "The first field")]
     field_one: String,
     #[graphql(description = "The second field")]
     field_two: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 struct FieldWithDefaults {
     #[graphql(default = "123")]
     field_one: i32,

juniper/src/executor_tests/introspection/mod.rs

@@ -10,7 +10,7 @@ use schema::model::RootNode;
 use types::scalars::EmptyMutation;
 use value::{ParseScalarResult, ParseScalarValue, Value};
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 #[graphql(name = "SampleEnum")]
 enum Sample {
     One,

juniper/src/executor_tests/variables.rs

@@ -32,7 +32,7 @@ graphql_scalar!(TestComplexScalar {
     }
 });
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(scalar = "DefaultScalarValue")]
 struct TestInputObject {
     a: Option<String>,
@@ -41,20 +41,20 @@ struct TestInputObject {
     d: Option<TestComplexScalar>,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 #[graphql(scalar = "DefaultScalarValue")]
 struct TestNestedInputObject {
     na: TestInputObject,
     nb: String,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 struct ExampleInputObject {
     a: Option<String>,
     b: i32,
 }
 
-#[derive(GraphQLInputObject, Debug)]
+#[derive(GraphQLInputObjectInternal, Debug)]
 struct InputWithDefaults {
     #[graphql(default = "123")]
     a: i32,

juniper/src/lib.rs

@@ -121,20 +121,6 @@ extern crate juniper_codegen;
 #[doc(hidden)]
 pub use juniper_codegen::*;
 
-// This macro is used as abstraction to make custom derives work
-// in juniper itself and outside of juniper
-// This macro needs to be here because it is used a derive in value::scalar
-// The tests in macros are using a macro from the value module, and because
-// rust macros needs to be defined before they are used it would cause problems
-// to move this macro somewhere else.
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __juniper_use_everything {
-    () => {
-        pub use $crate::*;
-    };
-}
-
 #[macro_use]
 mod value;
 #[macro_use]

juniper/src/macros/tests/args.rs

@@ -19,7 +19,7 @@ Syntax to validate:
 
 */
 
-#[derive(GraphQLInputObject)]
+#[derive(GraphQLInputObjectInternal)]
 struct Point {
     x: i32,
 }

juniper/src/parser/tests/value.rs

@@ -9,17 +9,17 @@ use schema::meta::{MetaType, ScalarMeta, EnumMeta, EnumValue, InputObjectMeta, A
 use schema::model::SchemaType;
 use types::scalars::EmptyMutation;
 
-#[derive(GraphQLEnum)]
+#[derive(GraphQLEnumInternal)]
 enum Enum {
     EnumValue
 }
 
-#[derive(GraphQLInputObject)]
+#[derive(GraphQLInputObjectInternal)]
 struct Bar {
     foo: String,
 }
 
-#[derive(GraphQLInputObject)]
+#[derive(GraphQLInputObjectInternal)]
 struct Foo {
     key: i32,
     other: Bar,

juniper/src/schema/model.rs

@@ -57,7 +57,7 @@ pub struct DirectiveType<'a, S> {
     pub arguments: Vec<Argument<'a, S>>,
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, GraphQLEnum)]
+#[derive(Clone, PartialEq, Eq, Debug, GraphQLEnumInternal)]
 #[graphql(name = "__DirectiveLocation")]
 pub enum DirectiveLocation {
     Query,

juniper/src/tests/model.rs

@@ -2,7 +2,7 @@
 
 use std::collections::HashMap;
 
-#[derive(GraphQLEnum, Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(GraphQLEnumInternal, Copy, Clone, Eq, PartialEq, Debug)]
 pub enum Episode {
     #[graphql(name = "NEW_HOPE")]
     NewHope,