Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	juniper_codegen/src/lib.rs

Author: ForsakenHarmony

.travis.yml

@@ -1,25 +1,42 @@
 language: rust
-cache: cargo
-sudo: true
 
 rust:
   - stable
   - beta
   - nightly
 
   # Prevent accidentally breaking older Rust versions
-  - 1.22.0
-  - 1.21.0
+  - 1.31.0
+  - 1.30.0
+
+matrix:
+  include:
+    - language: rust
+      rust: stable
+      name: "check wasm32 support"
+      install: rustup target add wasm32-unknown-unknown
+      script: cargo check --target wasm32-unknown-unknown --package juniper --package juniper_codegen
 
 env:
   global:
     - secure: "SsepHEYRmW9ee3RhxPpqGuPigZINFfA/yOwUJFseQt4t+Zs90r1xdl3Q8eDfPlnvBsL7Rd0QQrFDO7JUaimVLlgQkUnrl62o0CYzkodp+qtocyAHS00W6WTqi8Y6E6KBxPshCl03dRLaySUfx5TqTLTIHkJ0G6vDW35k7hRrA3221lRphs5rrpvAZ21pqsDsNLH3HVo792L6A0kOtBa3ocw1pgHLxnBbArIViu2htUuFvY/TgsmVbAdlow0efw/xkcJ/p0/r5q7igLek6Iqk8udfRc7CktvoiFQ2vUnhtNtQu/zYll3Q7OUx5d+w5lhbzz2QINmsezBEisH9k1haL7dMviLPp0pn4WZed60KovO0Iqfgjy1utTaKvJVfNWYsgkfU8c9a/z2rcZOKwXNKQW2ptBrtVjaB9dk7eMoyuFCDZwNtKqvG+ZKmvMpun+R8mmx+buOmN8Vlf5ygIoGxz3nbEtlLYGVTXHfdXXqRkFIwtiYVJEO7SLRKT9pbx1E++ARsi2+y8bXJT4e4z0osYMq9EsiFUpw3J2gcshrgseqkB7UgCZ3SXuitJnJNfDAU3a3nwwS/JiAunZMNnC4rKUBbl7WbTB4Cpw7EgVOlCqcyyzlkNl3xabLzTFzLOfSHLTVX5FmGNsD21vBoS5/8ejftx9wuV3rGHxuO3i3+A3k="
     - RUSTFLAGS="-C link-dead-code"
     - CARGO_MAKE_RUN_CODECOV=true
 
+before_script:
+  - |
+      if [ "$TRAVIS_OS_NAME" = 'windows' ]; then
+        powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.15.3" -target "x86_64-pc-windows-msvc"
+      fi
+  - |
+      if [ "$TRAVIS_OS_NAME" = 'linux' ]; then
+        _build/cargo-make.sh "0.15.3" "x86_64-unknown-linux-musl"
+      fi
+  - |
+      if [ "$TRAVIS_OS_NAME" = 'osx' ]; then
+        _build/cargo-make.sh "0.15.3" "x86_64-apple-darwin"
+      fi
 script:
-  - wget -O ~/.cargo/bin/cargo-make https://bintray.com/sagiegurari/cargo-make/download_file?file_path=cargo-make_v0.11.0u
-  - chmod 777 ~/.cargo/bin/cargo-make
   - cargo make workspace-ci-flow --no-workspace
 
 before_deploy:
@@ -40,14 +57,3 @@ deploy:
 after_deploy:
   - cd juniper_codegen && cargo publish --token "$CRATES_IO_TOKEN" && cd ..
   - cd juniper && cargo publish --token "$CRATES_IO_TOKEN" && cd ..
-
-before_cache:
-  rm -rf target/debug/juniper*
-  rm -rf target/debug/libjuniper*
-  rm -rf target/debug/.fingerprint/juniper*
-
-  rm -rf target/release/juniper*
-  rm -rf target/release/libjuniper*
-  rm -rf target/release/.fingerprint/juniper*
-
-  rm -rf target/package/

Cargo.toml

@@ -1,8 +1,12 @@
 [workspace]
+# Order is important as this is the order the crates will be released.
 members = [
-  "juniper",
   "juniper_codegen",
-  "juniper_tests",
+  "juniper",
+  "integration_tests/juniper_tests",
+  "integration_tests/juniper_2018_edition_tests",
+  "juniper_hyper",
   "juniper_iron",
   "juniper_rocket",
+  "juniper_warp",
 ]

Makefile.toml

@@ -0,0 +1,17 @@
+# https://github.com/sagiegurari/cargo-make#automatically-extend-workspace-makefile
+[env]
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = "true"
+
+# Run `cargo make release` to push a new minor release of every crate.
+[tasks.release]
+args = ["release", "--config", "../_build/release.toml"]
+
+# Run `cargo make release-patch` to push a new patch release of every crate.
+[tasks.release-patch]
+args = ["release", "--config", "../_build/release.toml", "patch"]
+
+# Run `cargo make release-dry-run` to do a dry run.
+[tasks.release-dry-run]
+description = "Run `cargo-release --dry-run` for every crate"
+command = "${HOME}/src/cargo-release/target/debug/cargo-release"
+args = ["release", "--config", "../_build/release.toml", "--dry-run"]

README.md

@@ -1,56 +1,52 @@
-<img src="https://github.com/graphql-rust/juniper/blob/master/assets/logo/juniper-dark-word.png" alt="Juniper" width="500" />
-
+<img src="https://github.com/graphql-rust/juniper/raw/master/assets/logo/juniper-dark-word.png" alt="Juniper" width="500" />
 
 > 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://ci.appveyor.com/api/projects/status/xav6tor6biu617uu?svg=true)](https://ci.appveyor.com/project/theduke/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)
 [![Gitter chat](https://badges.gitter.im/juniper-graphql/gitter.png)](https://gitter.im/juniper-graphql)
 
-
 ---
 
 [GraphQL][graphql] is a data query language developed by Facebook intended to
-serve mobile and web application frontends. 
+serve mobile and web application frontends.
 
-*Juniper* makes it possible to write GraphQL servers in Rust that are 
-type-safe and blazingly fast. We also try to make declaring and resolving 
+_Juniper_ makes it possible to write GraphQL servers in Rust that are
+type-safe and blazingly fast. We also try to make declaring and resolving
 GraphQL schemas as convenient as possible as Rust will allow.
 
 Juniper does not include a web server - instead it provides building blocks to
 make integration with existing servers straightforward. It optionally provides a
-pre-built integration for the [Iron][iron] and [Rocket] frameworks, including
+pre-built integration for the [Hyper][hyper], [Iron][iron], [Rocket], and [Warp][warp] frameworks, including
 embedded [Graphiql][graphiql] for easy debugging.
 
-* [Cargo crate](https://crates.io/crates/juniper)
-* [API Reference][docsrs]
-* [Book][book]: Guides and Examples
-
+- [Cargo crate](https://crates.io/crates/juniper)
+- [API Reference][docsrs]
+- [Book][book]: Guides and Examples
 
 ## Getting Started
 
-The best place to get started is the [Juniper Book][book], which contains 
+The best place to get started is the [Juniper Book][book], which contains
 guides with plenty of examples, covering all features of Juniper. (very much WIP)
 
-To get started quickly and get a feel for Juniper, check out the 
+To get started quickly and get a feel for Juniper, check out the
 [Quickstart][book_quickstart] section.
 
-For specific information about macros, types and the Juniper api, the 
+For specific information about macros, types and the Juniper api, the
 [API Reference][docsrs] is the best place to look.
 
 You can also check out [src/tests/schema.rs][test_schema_rs] to see a complex
-schema including polymorphism with traits and interfaces.  
-For an example of web framework integration, 
-see the [rocket][rocket_examples] and [iron][iron_examples] examples folders.
-
+schema including polymorphism with traits and interfaces.
+For an example of web framework integration,
+see the [hyper][hyper_examples], [rocket][rocket_examples], [iron][iron_examples], and [warp][warp_examples] examples folders.
 
 ## Features
 
 Juniper supports the full GraphQL query language according to the
-[specification][graphql_spec], including interfaces, unions, schema 
-introspection, and validations.  
+[specification][graphql_spec], including interfaces, unions, schema
+introspection, and validations.
 It does not, however, support the schema language.
 
 As an exception to other GraphQL libraries for other languages, Juniper builds
@@ -66,19 +62,20 @@ Juniper has automatic integration with some very common Rust crates to make
 building schemas a breeze. The types from these crates will be usable in
 your Schemas automatically.
 
-* [uuid][uuid]
-* [url][url]
-* [chrono][chrono]
+- [uuid][uuid]
+- [url][url]
+- [chrono][chrono]
 
 ### Web Frameworks
 
-* [rocket][rocket]
-* [iron][iron]
+- [hyper][hyper]
+- [rocket][rocket]
+- [iron][iron]
+- [warp][warp]
 
 ## Guides & Examples
 
-* [Juniper + actix-web example](https://github.com/actix/examples/tree/master/juniper)
-
+- [Juniper + actix-web example](https://github.com/actix/examples/tree/master/juniper)
 
 ## API Stability
 
@@ -90,14 +87,16 @@ Juniper has not reached 1.0 yet, thus some API instability should be expected.
 [graphql_spec]: http://facebook.github.io/graphql
 [test_schema_rs]: https://github.com/graphql-rust/juniper/blob/master/juniper/src/tests/schema.rs
 [tokio]: https://github.com/tokio-rs/tokio
+[hyper_examples]: https://github.com/graphql-rust/juniper/tree/master/juniper_hyper/examples
 [rocket_examples]: https://github.com/graphql-rust/juniper/tree/master/juniper_rocket/examples
 [iron_examples]: https://github.com/graphql-rust/juniper/tree/master/juniper_iron/examples
-[Rocket]: https://rocket.rs
+[hyper]: https://hyper.rs
+[rocket]: https://rocket.rs
 [book]: https://graphql-rust.github.io
 [book_quickstart]: https://graphql-rust.github.io/quickstart.html
 [docsrs]: https://docs.rs/juniper
-
+[warp]: https://github.com/seanmonstar/warp
+[warp_examples]: https://github.com/graphql-rust/juniper/tree/master/juniper_warp/examples
 [uuid]: https://crates.io/crates/uuid
 [url]: https://crates.io/crates/url
 [chrono]: https://crates.io/crates/chrono
-

_build/azure-pipelines-template.yml

@@ -0,0 +1,56 @@
+jobs:
+- job: ${{ parameters.name }}
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  strategy:
+    matrix:
+      stable:
+        rustup_toolchain: stable
+      beta:
+        rustup_toolchain: beta
+      nightly:
+        rustup_toolchain: nightly
+      minimum_supported_version_plus_one:
+        rustup_toolchain: 1.31.0
+      minimum_supported_version:
+        rustup_toolchain: 1.30.0
+  steps:
+  - ${{ if ne(parameters.name, 'Windows') }}:
+    # Linux and macOS.
+    - script: |
+        curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
+        echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
+      displayName: Install rust
+  - ${{ if eq(parameters.name, 'Windows') }}:
+    # Windows.
+    - script: |
+        curl -sSf -o rustup-init.exe https://win.rustup.rs
+        rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
+        set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+        echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
+      displayName: Install rust (windows)
+  # All platforms.
+  - script: |
+        rustc -Vv
+        cargo -V
+    displayName: Query rust and cargo versions
+  - ${{ if eq(parameters.name, 'Linux') }}:
+    # Linux.
+    - script: _build/cargo-make.sh "0.15.3" "x86_64-unknown-linux-musl"
+      displayName: Install cargo-make binary
+  - ${{ if eq(parameters.name, 'macOS') }}:
+    # Mac.
+    - script: _build/cargo-make.sh "0.15.3" "x86_64-apple-darwin"
+      displayName: Install cargo-make binary
+  - ${{ if eq(parameters.name, 'Windows') }}:
+    # Windows.
+    - script: powershell -executionpolicy bypass -file _build/cargo-make.ps1 -version "0.15.3" -target "x86_64-pc-windows-msvc"
+      displayName: Install cargo-make binary
+  - script: cargo make workspace-ci-flow --no-workspace
+    env: { CARGO_MAKE_RUN_CODECOV: true }
+    displayName: Build and run tests
+  - script: |
+      rustup target add wasm32-unknown-unknown
+      cargo check --target wasm32-unknown-unknown --package juniper --package juniper_codegen
+    displayName: Check WebAssembly target
+    condition: eq(variables['rustup_toolchain'], 'stable')

_build/cargo-make.ps1

@@ -0,0 +1,21 @@
+param (
+   [Parameter(Mandatory=$true)][string]$version,
+   [Parameter(Mandatory=$true)][string]$target
+)
+
+# Location to put cargo-make binary.
+$cargobindir = "$env:userprofile\.cargo\bin"
+
+# Location to stage downloaded zip file.
+$zipfile = "$env:temp\cargo-make.zip"
+
+$url = "https://github.com/sagiegurari/cargo-make/releases/download/${version}/cargo-make-v${version}-${target}.zip"
+
+# Download the zip file.
+Invoke-WebRequest -Uri $url -OutFile $zipfile
+
+# Extract the binary to the correct location.
+Expand-Archive -Path $zipfile -DestinationPath $cargobindir
+
+# Tell azure pipelines the PATH has changed for future steps.
+Write-Host "##vso[task.setvariable variable=PATH;]%PATH%;$cargobindir"

_build/cargo-make.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ -z ${1+x} ];
+then
+ echo "Missing version as first argument";
+ exit 1
+fi
+
+if [ -z ${2+x} ];
+then
+ echo "Missing target as second argument";
+ exit 1
+fi
+
+curl https://github.com/sagiegurari/cargo-make/releases/download/${1}/cargo-make-v${1}-${2}.zip -sSfL -o /tmp/cargo-make.zip;
+unzip /tmp/cargo-make.zip;
+mv cargo-make-*/* $HOME/.cargo/bin;
+echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"

_build/release.toml

@@ -0,0 +1,8 @@
+no-dev-version = true
+pre-release-commit-message = "Release {{crate_name}} {{version}}"
+pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}"
+tag-message = "Release {{crate_name}} {{version}}"
+upload-doc = false
+pre-release-replacements = [
+  {file="CHANGELOG.md", search="# master", replace="# master\n\n- No changes yet\n\n# [[{{version}}] {{date}}](https://github.com/graphql-rust/juniper/releases/tag/{{crate_name}}-{{version}})"},
+]

appveyor.yml

@@ -0,0 +1,28 @@
+jobs:
+
+- job: check_formatting
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - script: |
+        curl https://sh.rustup.rs -sSf | sh -s -- -y
+        $HOME/.cargo/bin/rustup component add rustfmt
+      displayName: Install rust
+    - script: |
+        $HOME/.cargo/bin/cargo fmt -- --check
+      displayName: Check formatting
+
+- template: _build/azure-pipelines-template.yml
+  parameters:
+    name: Linux
+    vmImage: ubuntu-16.04
+
+- template: _build/azure-pipelines-template.yml
+  parameters:
+    name: macOS
+    vmImage: macOS-10.13
+
+- template: _build/azure-pipelines-template.yml
+  parameters:
+    name: Windows
+    vmImage: vs2017-win2016