diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-11-05 16:09:50 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-11-05 21:26:19 +0000 |
| commit | 649f341e95626afa56ca67c5595c8f35780b29a8 (patch) | |
| tree | d2b4a6fd98c9151b5b6c50f875e1b6f8e441eec3 /src/cmd/vendor/golang.org/x/mod/modfile/rule.go | |
| parent | 14a133fe7791cdad14dc55332a506801fa8ea5f9 (diff) | |
| download | go-649f341e95626afa56ca67c5595c8f35780b29a8.tar.gz go-649f341e95626afa56ca67c5595c8f35780b29a8.zip | |
cmd: update x/mod to CL 205497
Also revert an incidental 'gofmt' of a vendored file from CL 205240.
Updates #34822
Change-Id: I82a015d865db4d865b4776a8013312f25dbb9181
Reviewed-on: https://go-review.googlesource.com/c/go/+/205539
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@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 | 6 |
1 files changed, 5 insertions, 1 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 66b08d9723..292d5b60b5 100644 --- a/src/cmd/vendor/golang.org/x/mod/modfile/rule.go +++ b/src/cmd/vendor/golang.org/x/mod/modfile/rule.go @@ -505,9 +505,13 @@ func (f *File) AddGoStmt(version string) error { return fmt.Errorf("invalid language version string %q", version) } if f.Go == nil { + var hint Expr + if f.Module != nil && f.Module.Syntax != nil { + hint = f.Module.Syntax + } f.Go = &Go{ Version: version, - Syntax: f.Syntax.addLine(nil, "go", version), + Syntax: f.Syntax.addLine(hint, "go", version), } } else { f.Go.Version = version |