diff options
| author | Jay Conrod <jayconrod@google.com> | 2019-11-26 11:27:25 -0500 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2019-11-26 19:05:22 +0000 |
| commit | 27e50a1a25607fcf0a24e76dcbaa1fdac5267626 (patch) | |
| tree | 3dd315720a98e7a23182916616c9aaa451243913 /src/cmd/vendor/golang.org/x/mod/modfile/rule.go | |
| parent | 67f0f83216930e053441500e2b28c3fa2b667581 (diff) | |
| download | go-27e50a1a25607fcf0a24e76dcbaa1fdac5267626.tar.gz go-27e50a1a25607fcf0a24e76dcbaa1fdac5267626.zip | |
cmd: update golang.org/x/mod and vendor
This CL pulls in a fix to golang.org/x/mod/modfile. No change needed
to cmd/go.
Fixes #35737
Change-Id: I7ca1bb46d2923b01587042f0f312d3c3df54c425
Reviewed-on: https://go-review.googlesource.com/c/go/+/208977
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/vendor/golang.org/x/mod/modfile/rule.go')
| -rw-r--r-- | src/cmd/vendor/golang.org/x/mod/modfile/rule.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/cmd/vendor/golang.org/x/mod/modfile/rule.go b/src/cmd/vendor/golang.org/x/mod/modfile/rule.go index 292d5b60b5..62af06889f 100644 --- a/src/cmd/vendor/golang.org/x/mod/modfile/rule.go +++ b/src/cmd/vendor/golang.org/x/mod/modfile/rule.go @@ -313,8 +313,8 @@ func isIndirect(line *Line) bool { if len(line.Suffix) == 0 { return false } - f := strings.Fields(line.Suffix[0].Token) - return (len(f) == 2 && f[1] == "indirect" || len(f) > 2 && f[1] == "indirect;") && f[0] == "//" + f := strings.Fields(strings.TrimPrefix(line.Suffix[0].Token, string(slashSlash))) + return (len(f) == 1 && f[0] == "indirect" || len(f) > 1 && f[0] == "indirect;") } // setIndirect sets line to have (or not have) a "// indirect" comment. @@ -329,13 +329,17 @@ func setIndirect(line *Line, indirect bool) { line.Suffix = []Comment{{Token: "// indirect", Suffix: true}} return } - // Insert at beginning of existing comment. + com := &line.Suffix[0] - space := " " - if len(com.Token) > 2 && com.Token[2] == ' ' || com.Token[2] == '\t' { - space = "" + text := strings.TrimSpace(strings.TrimPrefix(com.Token, string(slashSlash))) + if text == "" { + // Empty comment. + com.Token = "// indirect" + return } - com.Token = "// indirect;" + space + com.Token[2:] + + // Insert at beginning of existing comment. + com.Token = "// indirect; " + text return } |