kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

vendor: golang.org/x/mod v0.4.2

Browse source 
full diff: https://github.com/golang/mod/compare/v0.4.1...v0.4.2

It's not used, but one of our dependencies has a `tools.go` file that forces
it to be vendored; vendor/cloud.google.com/go/tools.go

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-02-23 18:37:58 +01:00
parent 6be521ccb8
commit 1b829c2a6a
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
4 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor.mod
View file

@ -137,7 +137,7 @@ require (
go.opencensus.io v0.23.0 // indirect go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/mod v0.4.1 // indirect golang.org/x/mod v0.4.2 // indirect
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect
golang.org/x/text v0.3.6 // indirect golang.org/x/text v0.3.6 // indirect
golang.org/x/tools v0.1.0 // indirect golang.org/x/tools v0.1.0 // indirect

4
vendor.sum
View file

@ -773,8 +773,8 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

76
vendor/golang.org/x/mod/module/module.go generated vendored
View file

@ -224,12 +224,16 @@ func firstPathOK(r rune) bool {
'a' <= r && r <= 'z' 'a' <= r && r <= 'z'
} }
// pathOK reports whether r can appear in an import path element. // modPathOK reports whether r can appear in a module path element.
// Paths can be ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~. // Paths can be ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~.
// This matches what "go get" has historically recognized in import paths. //
// This matches what "go get" has historically recognized in import paths,
// and avoids confusing sequences like '%20' or '+' that would change meaning
// if used in a URL.
//
// TODO(rsc): We would like to allow Unicode letters, but that requires additional // TODO(rsc): We would like to allow Unicode letters, but that requires additional
// care in the safe encoding (see "escaped paths" above). // care in the safe encoding (see "escaped paths" above).
func pathOK(r rune) bool { func modPathOK(r rune) bool {
if r < utf8.RuneSelf { if r < utf8.RuneSelf {
return r == '-' || r == '.' || r == '_' || r == '~' || return r == '-' || r == '.' || r == '_' || r == '~' ||
'0' <= r && r <= '9' || '0' <= r && r <= '9' ||
@ -239,6 +243,17 @@ func pathOK(r rune) bool {
return false return false
} }
// modPathOK reports whether r can appear in a package import path element.
//
// Import paths are intermediate between module paths and file paths: we allow
// disallow characters that would be confusing or ambiguous as arguments to
// 'go get' (such as '@' and ' ' ), but allow certain characters that are
// otherwise-unambiguous on the command line and historically used for some
// binary names (such as '++' as a suffix for compiler binaries and wrappers).
func importPathOK(r rune) bool {
return modPathOK(r) || r == '+'
}
// fileNameOK reports whether r can appear in a file name. // fileNameOK reports whether r can appear in a file name.
// For now we allow all Unicode letters but otherwise limit to pathOK plus a few more punctuation characters. // For now we allow all Unicode letters but otherwise limit to pathOK plus a few more punctuation characters.
// If we expand the set of allowed characters here, we have to // If we expand the set of allowed characters here, we have to
@ -270,7 +285,7 @@ func fileNameOK(r rune) bool {
// CheckPath checks that a module path is valid. // CheckPath checks that a module path is valid.
// A valid module path is a valid import path, as checked by CheckImportPath, // A valid module path is a valid import path, as checked by CheckImportPath,
// with two additional constraints. // with three additional constraints.
// First, the leading path element (up to the first slash, if any), // First, the leading path element (up to the first slash, if any),
// by convention a domain name, must contain only lower-case ASCII letters, // by convention a domain name, must contain only lower-case ASCII letters,
// ASCII digits, dots (U+002E), and dashes (U+002D); // ASCII digits, dots (U+002E), and dashes (U+002D);
@ -280,8 +295,9 @@ func fileNameOK(r rune) bool {
// and must not contain any dots. For paths beginning with "gopkg.in/", // and must not contain any dots. For paths beginning with "gopkg.in/",
// this second requirement is replaced by a requirement that the path // this second requirement is replaced by a requirement that the path
// follow the gopkg.in server's conventions. // follow the gopkg.in server's conventions.
// Third, no path element may begin with a dot.
func CheckPath(path string) error { func CheckPath(path string) error {
if err := checkPath(path, false); err != nil { if err := checkPath(path, modulePath); err != nil {
return fmt.Errorf("malformed module path %q: %v", path, err) return fmt.Errorf("malformed module path %q: %v", path, err)
} }
i := strings.Index(path, "/") i := strings.Index(path, "/")
@ -315,7 +331,7 @@ func CheckPath(path string) error {
// //
// A valid path element is a non-empty string made up of // A valid path element is a non-empty string made up of
// ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~. // ASCII letters, ASCII digits, and limited ASCII punctuation: - . _ and ~.
// It must not begin or end with a dot (U+002E), nor contain two dots in a row. // It must not end with a dot (U+002E), nor contain two dots in a row.
// //
// The element prefix up to the first dot must not be a reserved file name // The element prefix up to the first dot must not be a reserved file name
// on Windows, regardless of case (CON, com1, NuL, and so on). The element // on Windows, regardless of case (CON, com1, NuL, and so on). The element
@ -326,19 +342,29 @@ func CheckPath(path string) error {
// top-level package documentation for additional information about // top-level package documentation for additional information about
// subtleties of Unicode. // subtleties of Unicode.
func CheckImportPath(path string) error { func CheckImportPath(path string) error {
if err := checkPath(path, false); err != nil { if err := checkPath(path, importPath); err != nil {
return fmt.Errorf("malformed import path %q: %v", path, err) return fmt.Errorf("malformed import path %q: %v", path, err)
} }
return nil return nil
} }
// pathKind indicates what kind of path we're checking. Module paths,
// import paths, and file paths have different restrictions.
type pathKind int
const (
modulePath pathKind = iota
importPath
filePath
)
// checkPath checks that a general path is valid. // checkPath checks that a general path is valid.
// It returns an error describing why but not mentioning path. // It returns an error describing why but not mentioning path.
// Because these checks apply to both module paths and import paths, // Because these checks apply to both module paths and import paths,
// the caller is expected to add the "malformed ___ path %q: " prefix. // the caller is expected to add the "malformed ___ path %q: " prefix.
// fileName indicates whether the final element of the path is a file name // fileName indicates whether the final element of the path is a file name
// (as opposed to a directory name). // (as opposed to a directory name).
func checkPath(path string, fileName bool) error { func checkPath(path string, kind pathKind) error {
if !utf8.ValidString(path) { if !utf8.ValidString(path) {
return fmt.Errorf("invalid UTF-8") return fmt.Errorf("invalid UTF-8")
} }
@ -357,39 +383,45 @@ func checkPath(path string, fileName bool) error {
elemStart := 0 elemStart := 0
for i, r := range path { for i, r := range path {
if r == '/' { if r == '/' {
if err := checkElem(path[elemStart:i], fileName); err != nil { if err := checkElem(path[elemStart:i], kind); err != nil {
return err return err
} }
elemStart = i + 1 elemStart = i + 1
} }
} }
if err := checkElem(path[elemStart:], fileName); err != nil { if err := checkElem(path[elemStart:], kind); err != nil {
return err return err
} }
return nil return nil
} }
// checkElem checks whether an individual path element is valid. // checkElem checks whether an individual path element is valid.
// fileName indicates whether the element is a file name (not a directory name). func checkElem(elem string, kind pathKind) error {
func checkElem(elem string, fileName bool) error {
if elem == "" { if elem == "" {
return fmt.Errorf("empty path element") return fmt.Errorf("empty path element")
} }
if strings.Count(elem, ".") == len(elem) { if strings.Count(elem, ".") == len(elem) {
return fmt.Errorf("invalid path element %q", elem) return fmt.Errorf("invalid path element %q", elem)
} }
if elem[0] == '.' && !fileName { if elem[0] == '.' && kind == modulePath {
return fmt.Errorf("leading dot in path element") return fmt.Errorf("leading dot in path element")
} }
if elem[len(elem)-1] == '.' { if elem[len(elem)-1] == '.' {
return fmt.Errorf("trailing dot in path element") return fmt.Errorf("trailing dot in path element")
} }
charOK := pathOK
if fileName {
charOK = fileNameOK
}
for _, r := range elem { for _, r := range elem {
if !charOK(r) { ok := false
switch kind {
case modulePath:
ok = modPathOK(r)
case importPath:
ok = importPathOK(r)
case filePath:
ok = fileNameOK(r)
default:
panic(fmt.Sprintf("internal error: invalid kind %v", kind))
}
if !ok {
return fmt.Errorf("invalid char %q", r) return fmt.Errorf("invalid char %q", r)
} }
} }
@ -406,7 +438,7 @@ func checkElem(elem string, fileName bool) error {
} }
} }
if fileName { if kind == filePath {
// don't check for Windows short-names in file names. They're // don't check for Windows short-names in file names. They're
// only an issue for import paths. // only an issue for import paths.
return nil return nil
@ -444,7 +476,7 @@ func checkElem(elem string, fileName bool) error {
// top-level package documentation for additional information about // top-level package documentation for additional information about
// subtleties of Unicode. // subtleties of Unicode.
func CheckFilePath(path string) error { func CheckFilePath(path string) error {
if err := checkPath(path, true); err != nil { if err := checkPath(path, filePath); err != nil {
return fmt.Errorf("malformed file path %q: %v", path, err) return fmt.Errorf("malformed file path %q: %v", path, err)
} }
return nil return nil
@ -647,7 +679,7 @@ func EscapePath(path string) (escaped string, err error) {
// Versions are allowed to be in non-semver form but must be valid file names // Versions are allowed to be in non-semver form but must be valid file names
// and not contain exclamation marks. // and not contain exclamation marks.
func EscapeVersion(v string) (escaped string, err error) { func EscapeVersion(v string) (escaped string, err error) {
if err := checkElem(v, true); err != nil || strings.Contains(v, "!") { if err := checkElem(v, filePath); err != nil || strings.Contains(v, "!") {
return "", &InvalidVersionError{ return "", &InvalidVersionError{
Version: v, Version: v,
Err: fmt.Errorf("disallowed version string"), Err: fmt.Errorf("disallowed version string"),
@ -706,7 +738,7 @@ func UnescapeVersion(escaped string) (v string, err error) {
if !ok { if !ok {
return "", fmt.Errorf("invalid escaped version %q", escaped) return "", fmt.Errorf("invalid escaped version %q", escaped)
} }
if err := checkElem(v, true); err != nil { if err := checkElem(v, filePath); err != nil {
return "", fmt.Errorf("invalid escaped version %q: %v", v, err) return "", fmt.Errorf("invalid escaped version %q: %v", v, err)
} }
return v, nil return v, nil

2
vendor/modules.txt vendored
View file

@ -806,7 +806,7 @@ golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
## explicit; go 1.11 ## explicit; go 1.11
golang.org/x/lint golang.org/x/lint
golang.org/x/lint/golint golang.org/x/lint/golint
# golang.org/x/mod v0.4.1 # golang.org/x/mod v0.4.2
## explicit; go 1.12 ## explicit; go 1.12
golang.org/x/mod/module golang.org/x/mod/module
golang.org/x/mod/semver golang.org/x/mod/semver