aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modload/build.go
diff options
context:
space:
mode:
authorJay Conrod <jayconrod@google.com>2019-10-16 15:26:15 -0400
committerJay Conrod <jayconrod@google.com>2019-10-29 20:10:15 +0000
commit1fb7d5472e8f46faaa034fe6e16ca66a1e7c766f (patch)
tree148c5b356d4a5d7e24ce6349beb33c4a55219300 /src/cmd/go/internal/modload/build.go
parentcc47b0d2cd1c633f1a3c21632978d1180f65195f (diff)
downloadgo-1fb7d5472e8f46faaa034fe6e16ca66a1e7c766f.tar.gz
go-1fb7d5472e8f46faaa034fe6e16ca66a1e7c766f.zip
cmd/go: delete internal packages moved to x/mod
This change deletes several internal packages, replaces imports to them with the equivalent golang.org/x/mod packages, updates x/mod, and re-runs 'go mod vendor'. Packages are replaced as follows: cmd/go/internal/modfile → golang.org/x/mod/modfile cmd/go/internal/module → golang.org/x/mod/module cmd/go/internal/semver → golang.org/x/mod/semver cmd/go/internal/sumdb → golang.org/x/mod/sumdb cmd/go/internal/dirhash → golang.org/x/mod/sumdb/dirhash cmd/go/internal/note → golang.org/x/mod/sumdb/note cmd/go/internal/tlog → golang.org/x/mod/sumdb/tlog Updates #31761 Fixes #34924 Change-Id: Ie3bf677bb0be49af969f654a0214243a6547eb57 Reviewed-on: https://go-review.googlesource.com/c/go/+/202698 Run-TryBot: Jay Conrod <jayconrod@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/build.go')
-rw-r--r--src/cmd/go/internal/modload/build.go16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/cmd/go/internal/modload/build.go b/src/cmd/go/internal/modload/build.go
index acbebb6d66..352ec73758 100644
--- a/src/cmd/go/internal/modload/build.go
+++ b/src/cmd/go/internal/modload/build.go
@@ -6,13 +6,6 @@ package modload
import (
"bytes"
- "cmd/go/internal/base"
- "cmd/go/internal/cfg"
- "cmd/go/internal/modfetch"
- "cmd/go/internal/modinfo"
- "cmd/go/internal/module"
- "cmd/go/internal/search"
- "cmd/go/internal/semver"
"encoding/hex"
"fmt"
"internal/goroot"
@@ -20,6 +13,15 @@ import (
"path/filepath"
"runtime/debug"
"strings"
+
+ "cmd/go/internal/base"
+ "cmd/go/internal/cfg"
+ "cmd/go/internal/modfetch"
+ "cmd/go/internal/modinfo"
+ "cmd/go/internal/search"
+
+ "golang.org/x/mod/module"
+ "golang.org/x/mod/semver"
)
var (