hugolib: Use stdlib context package

hugolib/page_bundler.go

@@ -14,13 +14,11 @@
 package hugolib
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"runtime"
 
-	// Use this until errgroup gets ported to context
-	// See https://github.com/golang/go/issues/19781
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 )
 

hugolib/site.go

@@ -14,6 +14,7 @@
 package hugolib
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"html/template"
@@ -43,7 +44,6 @@ import (
 	"github.com/gohugoio/hugo/media"
 
 	"github.com/markbates/inflect"
-	"golang.org/x/net/context"
 
 	"github.com/fsnotify/fsnotify"
 	bp "github.com/gohugoio/hugo/bufferpool"