Merge remote-tracking branch 'upstream/master'

Author: davidpdrsn

.travis.yml

@@ -1,14 +1,20 @@
 [workspace]
 # Order is important as this is the order the crates will be released.
 members = [
+  "juniper_benchmarks",
   "juniper_codegen",
   "juniper",
   "integration_tests/juniper_tests",
+  "integration_tests/async_await",
   "juniper_hyper",
   "juniper_iron",
   "juniper_rocket",
-  "juniper_warp",
 ]
 exclude = [
   "docs/book/tests",
+  # TODO enable warp
+  "juniper_warp",
+  "examples/warp_async",
+  # TODO enable async tests
+  "juniper_rocket_async",
 ]

Cargo.toml

@@ -1,6 +1,7 @@
 # https://github.com/sagiegurari/cargo-make#automatically-extend-workspace-makefile
 [env]
 CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = "true"
+CARGO_MAKE_CARGO_ALL_FEATURES = ""
 
 #
 # Run `RELEASE_LEVEL=(patch|major|minor) cargo make release` to push a new release of every crate.
@@ -86,3 +87,12 @@ condition = { env_set = [ "RELEASE_LEVEL" ] }
 description = "Run `cargo-release` for every crate, but only make changes locally"
 command = "cargo-release"
 args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"]
+
+[tasks.test-verbose]
+dependencies = ["test-async-verbose"]
+
+[tasks.test-async-verbose]
+description = "Runs cargo test with async feature"
+category = "Test"
+command = "cargo"
+args = ["test", "--verbose", "--features", "async", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"]

Makefile.toml

@@ -2,7 +2,6 @@
 
 > GraphQL server library for Rust
 
-[![Build Status](https://travis-ci.org/graphql-rust/juniper.svg?branch=master)](https://travis-ci.org/graphql-rust/juniper)
 [![Build Status](https://dev.azure.com/graphql-rust/GraphQL%20Rust/_apis/build/status/graphql-rust.juniper)](https://dev.azure.com/graphql-rust/GraphQL%20Rust/_build/latest?definitionId=1)
 [![codecov](https://codecov.io/gh/graphql-rust/juniper/branch/master/graph/badge.svg)](https://codecov.io/gh/graphql-rust/juniper)
 [![Crates.io](https://img.shields.io/crates/v/juniper.svg?maxAge=2592000)](https://crates.io/crates/juniper)

README.md

@@ -21,7 +21,6 @@ jobs:
     - script: |
         export CARGO_HOME="$HOME/.cargo"
         curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
-        source /usr/local/cargo/env;
         echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
       displayName: Install rust
   - ${{ if eq(parameters.name, 'Windows') }}:
@@ -61,7 +60,6 @@ jobs:
     # Not Windows.
     - script: |
         export PATH="$PATH:$HOME/.cargo/bin";
-        source /usr/local/cargo/env;
         cargo make workspace-ci-flow --no-workspace
       env: { CARGO_MAKE_RUN_CODECOV: true }
       displayName: Build and run tests

_build/azure-pipelines-template.yml

@@ -44,7 +44,7 @@ impl juniper::Context for Context {}
 
 struct Query;
 
-#[juniper::object(
+#[juniper::graphql_object(
   Context = Context,
 )]
 impl Query {

docs/book/content/advanced/introspection.md

@@ -23,7 +23,7 @@ enum SignUpResult {
     Error(Vec<ValidationError>),
 }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl SignUpResult {
     fn user(&self) -> Option<&User> {
         match *self {

docs/book/content/advanced/non_struct_objects.md

@@ -25,7 +25,7 @@ struct ValidationError {
 # #[allow(dead_code)]
 struct MutationResult<T>(Result<T, Vec<ValidationError>>);
 
-#[juniper::object(
+#[juniper::graphql_object(
     name = "UserResult",
 )]
 impl MutationResult<User> {
@@ -38,7 +38,7 @@ impl MutationResult<User> {
     }
 }
 
-#[juniper::object(
+#[juniper::graphql_object(
     name = "ForumPostResult",
 )]
 impl MutationResult<ForumPost> {

docs/book/content/advanced/objects_and_generics.md

@@ -8,7 +8,7 @@ This page will give you a short introduction to the concepts in Juniper.
 
 ```toml
 [dependencies]
-juniper = "0.11"
+juniper = "0.14.2"
 ```
 
 ## Schema example
@@ -74,7 +74,7 @@ impl juniper::Context for Context {}
 
 struct Query;
 
-#[juniper::object(
+#[juniper::graphql_object(
     // Here we specify the context type for the object.
     // We need to do this in every type that
     // needs access to the context.
@@ -105,7 +105,7 @@ impl Query {
 
 struct Mutation;
 
-#[juniper::object(
+#[juniper::graphql_object(
     Context = Context,
 )]
 impl Mutation {
@@ -156,7 +156,7 @@ impl juniper::Context for Ctx {}
 
 struct Query;
 
-#[juniper::object(
+#[juniper::graphql_object(
     Context = Ctx,
 )]
 impl Query {

docs/book/content/quickstart.md

@@ -27,7 +27,7 @@ object in Juniper, most commonly using the `object` proc macro:
 # #[derive(juniper::GraphQLObject)] struct User { name: String }
 struct Root;
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Root {
     fn userWithUsername(username: String) -> FieldResult<Option<User>> {
         // Look up user in database...
@@ -48,7 +48,7 @@ usually performs some mutating side-effect, such as updating a database.
 # #[derive(juniper::GraphQLObject)] struct User { name: String }
 struct Mutations;
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Mutations {
     fn signUpUser(name: String, email: String) -> FieldResult<User> {
         // Validate inputs and save user in database...

docs/book/content/schema/schemas_and_mutations.md

@@ -47,7 +47,7 @@ fn context_factory(_: &mut Request) -> IronResult<()> {
 
 struct Root;
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Root {
     fn foo() -> String {
         "Bar".to_owned()
@@ -99,7 +99,7 @@ fn context_factory(req: &mut Request) -> IronResult<Context> {
 
 struct Root;
 
-#[juniper::object(
+#[juniper::graphql_object(
     Context = Context,
 )]
 impl Root {

docs/book/content/servers/iron.md

@@ -14,7 +14,7 @@ struct Coordinate {
 struct Root;
 # #[derive(juniper::GraphQLObject)] struct User { name: String }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Root {
     fn users_at_location(coordinate: Coordinate, radius: f64) -> Vec<User> {
         // Send coordinate to database
@@ -45,7 +45,7 @@ struct WorldCoordinate {
 struct Root;
 # #[derive(juniper::GraphQLObject)] struct User { name: String }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Root {
     fn users_at_location(coordinate: WorldCoordinate, radius: f64) -> Vec<User> {
         // Send coordinate to database

docs/book/content/types/input_objects.md

@@ -49,7 +49,7 @@ impl Character for Droid {
     fn as_droid(&self) -> Option<&Droid> { Some(&self) }
 }
 
-juniper::graphql_interface!(<'a> &'a Character: () as "Character" where Scalar = <S> |&self| {
+juniper::graphql_interface!(<'a> &'a dyn Character: () as "Character" where Scalar = <S> |&self| {
     field id() -> &str { self.id() }
 
     instance_resolvers: |_| {
@@ -111,7 +111,7 @@ impl Character for Droid {
     fn id(&self) -> &str { self.id.as_str() }
 }
 
-juniper::graphql_interface!(<'a> &'a Character: Database as "Character" where Scalar = <S> |&self| {
+juniper::graphql_interface!(<'a> &'a dyn Character: Database as "Character" where Scalar = <S> |&self| {
     field id() -> &str { self.id() }
 
     instance_resolvers: |&context| {

docs/book/content/types/interfaces.md

@@ -14,7 +14,7 @@ struct Person {
     age: i32,
 }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Person {
     fn name(&self) -> &str {
         self.name.as_str()
@@ -25,6 +25,14 @@ impl Person {
     }
 }
 
+// Note that this syntax generates an implementation of the GraphQLType trait,
+// the base impl of your struct can still be written like usual:
+impl Person {
+    pub fn hidden_from_graphql(&self) {
+        // [...]
+    }
+}
+
 # fn main() { }
 ```
 
@@ -43,7 +51,7 @@ struct House {
     inhabitants: Vec<Person>,
 }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl House {
     // Creates the field inhabitantWithName(name), returning a nullable person
     fn inhabitant_with_name(&self, name: String) -> Option<&Person> {
@@ -70,7 +78,7 @@ struct Person {
 }
 
 /// Doc comments are used as descriptions for GraphQL.
-#[juniper::object(
+#[juniper::graphql_object(
     // With this attribtue you can change the public GraphQL name of the type.
     name = "PersonObject",
     // You can also specify a description here, which will overwrite 
@@ -125,7 +133,7 @@ This will become better once the [Rust RFC 2565](https://github.com/rust-lang/ru
 
 struct Person {}
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Person {
     #[graphql(
         arguments(

docs/book/content/types/objects/complex_fields.md

@@ -25,7 +25,7 @@ struct Example {
     filename: PathBuf,
 }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Example {
     fn contents() -> FieldResult<String> {
         let mut file = File::open(&self.filename)?;
@@ -143,7 +143,7 @@ struct Example {
     whatever: Option<bool>,
 }
 
-#[juniper::object]
+#[juniper::graphql_object]
 impl Example {
     fn whatever() -> Result<bool, CustomError> {
       if let Some(value) = self.whatever {

docs/book/content/types/objects/error_handling.md

@@ -57,7 +57,7 @@ struct User {
 
 
 // Assign Database as the context type for User
-#[juniper::object(
+#[juniper::graphql_object(
     Context = Database,
 )]
 impl User {

docs/book/content/types/objects/using_contexts.md

@@ -121,8 +121,9 @@ juniper::graphql_scalar!(Date where Scalar = <S> {
 
     // Define how to parse a primitive type into your custom scalar.
     from_input_value(v: &InputValue) -> Option<Date> {
-        v.as_scalar_value::<String>()
-         .and_then(|s| s.parse().ok())
+        v.as_scalar_value()
+        .and_then(|v| v.as_str())
+        .and_then(|s| s.parse().ok())
     }
 
     // Define how to parse a string value.