Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use stdlib context #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.4
- 1.7

before_install:
- go get github.com/axw/gocov/gocov
Expand Down
2 changes: 1 addition & 1 deletion examples/starwars/schema.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package starwars

import (
"context"
"errors"

"github.com/graphql-go/graphql"
"github.com/graphql-go/relay"
"golang.org/x/net/context"
)

/**
Expand Down
3 changes: 2 additions & 1 deletion mutation.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package relay

import (
"context"

"github.com/graphql-go/graphql"
"golang.org/x/net/context"
)

type MutationFn func(inputMap map[string]interface{}, info graphql.ResolveInfo, ctx context.Context) (map[string]interface{}, error)
Expand Down
2 changes: 1 addition & 1 deletion mutation_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package relay_test

import (
"context"
"errors"
"reflect"
"testing"
Expand All @@ -11,7 +12,6 @@ import (
"github.com/graphql-go/graphql/language/location"
"github.com/graphql-go/graphql/testutil"
"github.com/graphql-go/relay"
"golang.org/x/net/context"
)

func testAsyncDataMutation(resultChan *chan int) {
Expand Down
5 changes: 3 additions & 2 deletions node.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package relay

import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"github.com/graphql-go/graphql"
"golang.org/x/net/context"
"strings"

"github.com/graphql-go/graphql"
)

type NodeDefinitions struct {
Expand Down
2 changes: 1 addition & 1 deletion node_global_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package relay_test

import (
"context"
"errors"
"fmt"
"reflect"
Expand All @@ -9,7 +10,6 @@ import (
"github.com/graphql-go/graphql"
"github.com/graphql-go/graphql/testutil"
"github.com/graphql-go/relay"
"golang.org/x/net/context"
)

type photo2 struct {
Expand Down
2 changes: 1 addition & 1 deletion node_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package relay_test

import (
"context"
"errors"
"fmt"
"reflect"
Expand All @@ -11,7 +12,6 @@ import (
"github.com/graphql-go/graphql/language/location"
"github.com/graphql-go/graphql/testutil"
"github.com/graphql-go/relay"
"golang.org/x/net/context"
)

type user struct {
Expand Down