summaryrefslogtreecommitdiffstats
path: root/hugolib
diff options
context:
space:
mode:
authorGregorio Martinez <greg@gmartinez.com>2018-10-01 22:08:10 -0400
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-10-03 14:59:35 +0200
commit4b4af2c52e658d516dd4bfaf59fef4f054dabec3 (patch)
tree61cb5ed26f4d2c59e5f02b7a199956918afb6984 /hugolib
parentfae48d7457de96969ec53349194dcbfa45adc269 (diff)
hugolib: Use stdlib context package
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/page_bundler.go4
-rw-r--r--hugolib/site.go2
2 files changed, 2 insertions, 4 deletions
diff --git a/hugolib/page_bundler.go b/hugolib/page_bundler.go
index 6870dc152..f3aaef826 100644
--- 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 71a8a03e3..1196496d3 100644
--- 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"