Skip to content

Commit 10a082a

Browse files
author
Bryan C. Mills
committed
cmd/go: update x/mod to fix "//indirect" comment editing
Fixes #45932 Change-Id: I043aecb6224348faf54c1d41fdbc00aa566089c2 Reviewed-on: https://go-review.googlesource.com/c/go/+/316751 Trust: Bryan C. Mills <[email protected]> Run-TryBot: Bryan C. Mills <[email protected]> Reviewed-by: Jay Conrod <[email protected]> TryBot-Result: Go Bot <[email protected]>
1 parent f62739b commit 10a082a

File tree

6 files changed

+39
-5
lines changed

6 files changed

+39
-5
lines changed

src/cmd/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect
88
golang.org/x/arch v0.0.0-20210502124803-cbf565b21d1e
99
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e // indirect
10-
golang.org/x/mod v0.4.3-0.20210503183026-4435ecfe4815
10+
golang.org/x/mod v0.4.3-0.20210504181020-67f1c1edc27a
1111
golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
1212
golang.org/x/term v0.0.0-20210503060354-a79de5458b56
1313
golang.org/x/tools v0.1.1-0.20210503200558-19b1717ea5eb

src/cmd/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e h1:8foAy0aoO5GkqCvAEJ4VC4
1111
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
1212
golang.org/x/mod v0.4.3-0.20210503183026-4435ecfe4815 h1:9nyskUepGPcX93addfTsdRqsQ7rSWIdQOdWVcsWAYv0=
1313
golang.org/x/mod v0.4.3-0.20210503183026-4435ecfe4815/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
14+
golang.org/x/mod v0.4.3-0.20210504181020-67f1c1edc27a h1:wbpC/7Wbo5WFVox32n+KjhRRLmTLq8YW/wRlL2iVAhk=
15+
golang.org/x/mod v0.4.3-0.20210504181020-67f1c1edc27a/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
1416
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1517
golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
1618
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# https://golang.org/issue/45932: "indirect" comments missing spaces
2+
# should not be corrupted when the comment is removed.
3+
4+
go mod tidy
5+
cmp go.mod go.mod.direct
6+
7+
-- go.mod --
8+
module example.net/m
9+
10+
go 1.16
11+
12+
require example.net/x v0.1.0 //indirect
13+
14+
replace example.net/x v0.1.0 => ./x
15+
-- go.mod.direct --
16+
module example.net/m
17+
18+
go 1.16
19+
20+
require example.net/x v0.1.0
21+
22+
replace example.net/x v0.1.0 => ./x
23+
-- m.go --
24+
package m
25+
import _ "example.net/x"
26+
27+
-- x/go.mod --
28+
module example.net/x
29+
30+
go 1.16
31+
-- x/x.go --
32+
package x

src/cmd/vendor/golang.org/x/mod/modfile/rule.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/mod/module/module.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ golang.org/x/arch/x86/x86asm
2828
## explicit; go 1.17
2929
golang.org/x/crypto/ed25519
3030
golang.org/x/crypto/ed25519/internal/edwards25519
31-
# golang.org/x/mod v0.4.3-0.20210503183026-4435ecfe4815
31+
# golang.org/x/mod v0.4.3-0.20210504181020-67f1c1edc27a
3232
## explicit; go 1.17
3333
golang.org/x/mod/internal/lazyregexp
3434
golang.org/x/mod/modfile

0 commit comments

Comments
 (0)