diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2022-12-09 20:01:26 -0500 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-12-12 20:37:14 +0000 |
| commit | a69753836928bab0cc4c3a2e6fc127572c1787bf (patch) | |
| tree | d063651224c150312d57c2df3701fe1fb16f633c /cmd | |
| parent | 21c8d588a16038d7ee9aa5e15e0cb96d55c59189 (diff) | |
| download | go-x-website-a69753836928bab0cc4c3a2e6fc127572c1787bf.tar.xz | |
internal/backport: delete
Now that the deploy happens with Go 1.19, it's viable to start using
these packages from the standard library instead of their backported
temporary copies.
Keeping Go 1.18 happy during its last two months of support requires
a tiny complication in pkgdoc package. An alternative path is to not
drop internal/backport/go/doc and all of its dependencies right away,
but getting to zero backported packages sooner was hard to resist...
For golang/go#51800.
Change-Id: Ieb7a137a033d6b6850dfc019c8c0c767756cc30d
Reviewed-on: https://go-review.googlesource.com/c/website/+/456522
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Bypass: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/golangorg/server.go | 4 | ||||
| -rw-r--r-- | cmd/googlegolangorg/main.go | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go index 88c8d32a..239831a7 100644 --- a/cmd/golangorg/server.go +++ b/cmd/golangorg/server.go @@ -14,6 +14,8 @@ import ( "errors" "flag" "fmt" + "go/format" + "html/template" "io/fs" "io/ioutil" "log" @@ -31,8 +33,6 @@ import ( "cloud.google.com/go/datastore" "golang.org/x/build/repos" "golang.org/x/website" - "golang.org/x/website/internal/backport/go/format" - "golang.org/x/website/internal/backport/html/template" "golang.org/x/website/internal/blog" "golang.org/x/website/internal/codewalk" "golang.org/x/website/internal/dl" diff --git a/cmd/googlegolangorg/main.go b/cmd/googlegolangorg/main.go index d53d1ee8..e143a43f 100644 --- a/cmd/googlegolangorg/main.go +++ b/cmd/googlegolangorg/main.go @@ -3,11 +3,10 @@ package main import ( "fmt" + "html/template" "net/http" "os" "strings" - - "golang.org/x/website/internal/backport/html/template" ) var repoMap = map[string]*repoImport{ |