diff options
| author | Jay Conrod <jayconrod@google.com> | 2021-09-09 09:38:55 -0700 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2021-09-20 18:41:57 +0000 |
| commit | 3c764babe7b5e01a4e04b1a2c7975cdb5c5651a0 (patch) | |
| tree | b2c4731167545e8e69b133476d8b21a0b766b7a5 /src/cmd/go.mod | |
| parent | 6268468e024ce7fa063611b98a2f11f17fd4bad8 (diff) | |
| download | go-3c764babe7b5e01a4e04b1a2c7975cdb5c5651a0.tar.gz go-3c764babe7b5e01a4e04b1a2c7975cdb5c5651a0.zip | |
cmd/go: write go.mod requirements more consistently for go 1.17+
If go.mod declares 1.17 or higher, when the go command rewrites go.mod
(for example, after 'go mod tidy'), it will be more consistent about
moving requirements in two blocks, one containing only direct
requirements, and one containing only indirect requirements.
The go command will not move requirements into or out of a block with
comments. It may still update versions and "// indirect" comments, and
it may delete unneeded requirements though.
Fixes #47563
Fixes #47733
Change-Id: Ia6fb3e302be53097893abf01aa7cea60ac7b069a
Reviewed-on: https://go-review.googlesource.com/c/go/+/343432
Trust: Jay Conrod <jayconrod@google.com>
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go.mod')
| -rw-r--r-- | src/cmd/go.mod | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 05a118d812..26be677254 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -4,12 +4,15 @@ go 1.18 require ( github.com/google/pprof v0.0.0-20210827144239-02619b876842 - github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect golang.org/x/arch v0.0.0-20210901143047-ebb09ed340f1 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/mod v0.5.1-0.20210830214625-1b1db11ec8f4 - golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect + golang.org/x/mod v0.5.1-0.20210913215816-37dd6891021a golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b golang.org/x/tools v0.1.6-0.20210904010709-360456621443 +) + +require ( + github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) |