hugolib: Use stdlib context package

diff --git a/hugolib/page_bundler.go b/hugolib/page_bundler.go
index 6870dc15296ae3643b0be3bdde25b26903591122..f3aaef826fbad7c1d72ffb110e427914dfab1647 100644 (file)
--- a/hugolib/page_bundler.go
+++ b/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"
 )
 

diff --git a/hugolib/site.go b/hugolib/site.go
index 71a8a03e38fe5e8cbe28b34863b3952637d9facf..1196496d3032788b1cf0b77f1732e77775ac27ff 100644 (file)
--- a/hugolib/site.go
+++ b/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"