Use stdlib context

.travis.yml

@@ -50,7 +50,6 @@ install:
   - go get -u github.com/shopspring/decimal
   - go get -u gopkg.in/inconshreveable/log15.v2
   - go get -u github.com/jackc/fake
-  - go get -u golang.org/x/net/context
   - go get -u github.com/jackc/pgmock/pgmsg
 
 script:

conn.go

@@ -1,6 +1,7 @@
 package pgx
 
 import (
+	"context"
 	"crypto/md5"
 	"crypto/tls"
 	"encoding/binary"
@@ -19,8 +20,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jackc/pgx/chunkreader"
 	"github.com/jackc/pgx/pgtype"
 )

conn_pool.go

@@ -1,8 +1,8 @@
 package pgx
 
 import (
+	"context"
 	"errors"
-	"golang.org/x/net/context"
 	"sync"
 	"time"
 )

conn_test.go

@@ -1,9 +1,9 @@
 package pgx_test
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
-	"golang.org/x/net/context"
 	"net"
 	"os"
 	"reflect"

query.go

@@ -1,13 +1,12 @@
 package pgx
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jackc/pgx/pgtype"
 )
 

query_test.go

@@ -2,16 +2,14 @@ package pgx_test
 
 import (
 	"bytes"
+	"context"
 	"database/sql"
 	"fmt"
 	"strings"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jackc/pgx"
-
 	"github.com/shopspring/decimal"
 )
 

stress_test.go

@@ -1,6 +1,7 @@
 package pgx_test
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -9,8 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jackc/fake"
 	"github.com/jackc/pgx"
 )