From: Gregorio Martinez <greg@gmartinez.com>
Date: Tue, 2 Oct 2018 02:08:10 +0000 (-0400)
Subject: hugolib: Use stdlib context package
X-Git-Tag: v0.50~72
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b4af2c52;p=brevno-suite%2Fhugo

hugolib: Use stdlib context package
---

diff --git a/hugolib/page_bundler.go b/hugolib/page_bundler.go
index 6870dc15..f3aaef82 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 71a8a03e..1196496d 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"