Skip to content

Commit 1fb7d54

Browse files
author
Jay Conrod
committed
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 <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]>
1 parent cc47b0d commit 1fb7d54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+4418
-2987
lines changed

‎src/cmd/go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ require (
66
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f
77
github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 // indirect
88
golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1
9-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c
9+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
10+
golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452
1011
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 // indirect
1112
golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5
1213
)

‎src/cmd/go.sum

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,22 @@ github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44/go.mod h1:
55
golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 h1:A71BZbKSu+DtCNry/x5JKn20C+64DirDHmePEA8k0FY=
66
golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
77
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
9-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
9+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
10+
golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452 h1:ES2W0A+AqNBCkgWga22gheu9IUDjq3TDmeCdY1A7jhk=
11+
golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
12+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1013
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1114
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1215
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1317
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 h1:vsphBvatvfbhlb4PO1BYSr9dzugGxJ/SQHoNufZJq1w=
1418
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1519
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
1620
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1721
golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5 h1:TFUhCYbgGMOGnRxJv+j0iAcxCjk8oGjXXWNejQBhUUs=
1822
golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
1923
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
24+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
25+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
2026
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

‎src/cmd/go/internal/dirhash/hash_test.go

-135
This file was deleted.

‎src/cmd/go/internal/get/path.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"unicode/utf8"
1212
)
1313

14-
// The following functions are copied verbatim from cmd/go/internal/module/module.go,
14+
// The following functions are copied verbatim from golang.org/x/mod/module/module.go,
1515
// with a change to additionally reject Windows short-names,
1616
// and one to accept arbitrary letters (golang.org/issue/29101).
1717
//

‎src/cmd/go/internal/modcmd/download.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
package modcmd
66

77
import (
8-
"cmd/go/internal/cfg"
98
"encoding/json"
109
"os"
1110

1211
"cmd/go/internal/base"
12+
"cmd/go/internal/cfg"
1313
"cmd/go/internal/modfetch"
1414
"cmd/go/internal/modload"
15-
"cmd/go/internal/module"
1615
"cmd/go/internal/par"
1716
"cmd/go/internal/work"
17+
18+
"golang.org/x/mod/module"
1819
)
1920

2021
var cmdDownload = &base.Command{

‎src/cmd/go/internal/modcmd/edit.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import (
1616

1717
"cmd/go/internal/base"
1818
"cmd/go/internal/modfetch"
19-
"cmd/go/internal/modfile"
2019
"cmd/go/internal/modload"
21-
"cmd/go/internal/module"
2220
"cmd/go/internal/work"
21+
22+
"golang.org/x/mod/modfile"
23+
"golang.org/x/mod/module"
2324
)
2425

2526
var cmdEdit = &base.Command{

‎src/cmd/go/internal/modcmd/graph.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ package modcmd
88

99
import (
1010
"bufio"
11-
"cmd/go/internal/cfg"
1211
"os"
1312
"sort"
1413

1514
"cmd/go/internal/base"
15+
"cmd/go/internal/cfg"
1616
"cmd/go/internal/modload"
17-
"cmd/go/internal/module"
1817
"cmd/go/internal/par"
1918
"cmd/go/internal/work"
19+
20+
"golang.org/x/mod/module"
2021
)
2122

2223
var cmdGraph = &base.Command{

‎src/cmd/go/internal/modcmd/tidy.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import (
1414
"cmd/go/internal/cfg"
1515
"cmd/go/internal/modfetch"
1616
"cmd/go/internal/modload"
17-
"cmd/go/internal/module"
1817
"cmd/go/internal/work"
18+
19+
"golang.org/x/mod/module"
1920
)
2021

2122
var cmdTidy = &base.Command{

‎src/cmd/go/internal/modcmd/vendor.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import (
1818
"cmd/go/internal/cfg"
1919
"cmd/go/internal/imports"
2020
"cmd/go/internal/modload"
21-
"cmd/go/internal/module"
22-
"cmd/go/internal/semver"
2321
"cmd/go/internal/work"
22+
23+
"golang.org/x/mod/module"
24+
"golang.org/x/mod/semver"
2425
)
2526

2627
var cmdVendor = &base.Command{

‎src/cmd/go/internal/modcmd/verify.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ package modcmd
66

77
import (
88
"bytes"
9-
"cmd/go/internal/cfg"
109
"fmt"
1110
"io/ioutil"
1211
"os"
1312

1413
"cmd/go/internal/base"
15-
"cmd/go/internal/dirhash"
14+
"cmd/go/internal/cfg"
1615
"cmd/go/internal/modfetch"
1716
"cmd/go/internal/modload"
18-
"cmd/go/internal/module"
1917
"cmd/go/internal/work"
18+
19+
"golang.org/x/mod/module"
20+
"golang.org/x/mod/sumdb/dirhash"
2021
)
2122

2223
var cmdVerify = &base.Command{

‎src/cmd/go/internal/modcmd/why.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
package modcmd
66

77
import (
8+
"fmt"
9+
"strings"
10+
811
"cmd/go/internal/base"
912
"cmd/go/internal/modload"
10-
"cmd/go/internal/module"
1113
"cmd/go/internal/work"
12-
"fmt"
13-
"strings"
14+
15+
"golang.org/x/mod/module"
1416
)
1517

1618
var cmdWhy = &base.Command{

‎src/cmd/go/internal/modconv/convert.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ import (
1313

1414
"cmd/go/internal/base"
1515
"cmd/go/internal/modfetch"
16-
"cmd/go/internal/modfile"
17-
"cmd/go/internal/module"
1816
"cmd/go/internal/par"
19-
"cmd/go/internal/semver"
17+
18+
"golang.org/x/mod/modfile"
19+
"golang.org/x/mod/module"
20+
"golang.org/x/mod/semver"
2021
)
2122

2223
// ConvertLegacyConfig converts legacy config to modfile.

‎src/cmd/go/internal/modconv/convert_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ import (
1919
"cmd/go/internal/cfg"
2020
"cmd/go/internal/modfetch"
2121
"cmd/go/internal/modfetch/codehost"
22-
"cmd/go/internal/modfile"
23-
"cmd/go/internal/module"
22+
23+
"golang.org/x/mod/modfile"
24+
"golang.org/x/mod/module"
2425
)
2526

2627
func TestMain(m *testing.M) {

‎src/cmd/go/internal/modconv/dep.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"strconv"
1313
"strings"
1414

15-
"cmd/go/internal/modfile"
16-
"cmd/go/internal/module"
17-
"cmd/go/internal/semver"
15+
"golang.org/x/mod/modfile"
16+
"golang.org/x/mod/module"
17+
"golang.org/x/mod/semver"
1818
)
1919

2020
func ParseGopkgLock(file string, data []byte) (*modfile.File, error) {

‎src/cmd/go/internal/modconv/glide.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package modconv
77
import (
88
"strings"
99

10-
"cmd/go/internal/modfile"
11-
"cmd/go/internal/module"
10+
"golang.org/x/mod/modfile"
11+
"golang.org/x/mod/module"
1212
)
1313

1414
func ParseGlideLock(file string, data []byte) (*modfile.File, error) {

‎src/cmd/go/internal/modconv/glock.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package modconv
77
import (
88
"strings"
99

10-
"cmd/go/internal/modfile"
11-
"cmd/go/internal/module"
10+
"golang.org/x/mod/modfile"
11+
"golang.org/x/mod/module"
1212
)
1313

1414
func ParseGLOCKFILE(file string, data []byte) (*modfile.File, error) {

‎src/cmd/go/internal/modconv/godeps.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package modconv
77
import (
88
"encoding/json"
99

10-
"cmd/go/internal/modfile"
11-
"cmd/go/internal/module"
10+
"golang.org/x/mod/modfile"
11+
"golang.org/x/mod/module"
1212
)
1313

1414
func ParseGodepsJSON(file string, data []byte) (*modfile.File, error) {

‎src/cmd/go/internal/modconv/modconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package modconv
66

7-
import "cmd/go/internal/modfile"
7+
import "golang.org/x/mod/modfile"
88

99
var Converters = map[string]func(string, []byte) (*modfile.File, error){
1010
"GLOCKFILE": ParseGLOCKFILE,

‎src/cmd/go/internal/modconv/tsv.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package modconv
77
import (
88
"strings"
99

10-
"cmd/go/internal/modfile"
11-
"cmd/go/internal/module"
10+
"golang.org/x/mod/modfile"
11+
"golang.org/x/mod/module"
1212
)
1313

1414
func ParseDependenciesTSV(file string, data []byte) (*modfile.File, error) {

0 commit comments

Comments
 (0)