mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[release-branch.go1.16] cmd/go: fix godoc formatting for text from 'go help install' 

Fixes #44860

Change-Id: I5a12c6437a91ce59307483ffcc70e084edc32197
Reviewed-on: https://go-review.googlesource.com/c/go/+/301329
Trust: Jay Conrod <jayconrod@google.com>
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
(cherry picked from commit 86bbf4beee)
Reviewed-on: https://go-review.googlesource.com/c/go/+/301429
This commit is contained in:
Jay Conrod 2021-03-12 13:48:32 -05:00 committed by Dmitri Shuralyov
parent 0da04a662a
commit f39c4deee8
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/go/alldocs.go
View File

@ -694,14 +694,18 @@
// - Arguments must be package paths or package patterns (with "..." wildcards). // - Arguments must be package paths or package patterns (with "..." wildcards).
// They must not be standard packages (like fmt), meta-patterns (std, cmd, // They must not be standard packages (like fmt), meta-patterns (std, cmd,
// all), or relative or absolute file paths. // all), or relative or absolute file paths.
//
// - All arguments must have the same version suffix. Different queries are not // - All arguments must have the same version suffix. Different queries are not
// allowed, even if they refer to the same version. // allowed, even if they refer to the same version.
//
// - All arguments must refer to packages in the same module at the same version. // - All arguments must refer to packages in the same module at the same version.
//
// - No module is considered the "main" module. If the module containing // - No module is considered the "main" module. If the module containing
// packages named on the command line has a go.mod file, it must not contain // packages named on the command line has a go.mod file, it must not contain
// directives (replace and exclude) that would cause it to be interpreted // directives (replace and exclude) that would cause it to be interpreted
// differently than if it were the main module. The module must not require // differently than if it were the main module. The module must not require
// a higher version of itself. // a higher version of itself.
//
// - Package path arguments must refer to main packages. Pattern arguments // - Package path arguments must refer to main packages. Pattern arguments
// will only match main packages. // will only match main packages.
// //

20
src/cmd/go/internal/work/build.go
View File

@ -482,18 +482,22 @@ To eliminate ambiguity about which module versions are used in the build, the
arguments must satisfy the following constraints: arguments must satisfy the following constraints:
- Arguments must be package paths or package patterns (with "..." wildcards). - Arguments must be package paths or package patterns (with "..." wildcards).
They must not be standard packages (like fmt), meta-patterns (std, cmd, They must not be standard packages (like fmt), meta-patterns (std, cmd,
all), or relative or absolute file paths. all), or relative or absolute file paths.
- All arguments must have the same version suffix. Different queries are not - All arguments must have the same version suffix. Different queries are not
allowed, even if they refer to the same version. allowed, even if they refer to the same version.
- All arguments must refer to packages in the same module at the same version. - All arguments must refer to packages in the same module at the same version.
- No module is considered the "main" module. If the module containing - No module is considered the "main" module. If the module containing
packages named on the command line has a go.mod file, it must not contain packages named on the command line has a go.mod file, it must not contain
directives (replace and exclude) that would cause it to be interpreted directives (replace and exclude) that would cause it to be interpreted
differently than if it were the main module. The module must not require differently than if it were the main module. The module must not require
a higher version of itself. a higher version of itself.
- Package path arguments must refer to main packages. Pattern arguments - Package path arguments must refer to main packages. Pattern arguments
will only match main packages. will only match main packages.
If the arguments don't have version suffixes, "go install" may run in If the arguments don't have version suffixes, "go install" may run in
module-aware mode or GOPATH mode, depending on the GO111MODULE environment module-aware mode or GOPATH mode, depending on the GO111MODULE environment