mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
modernize: Use strings.CutSuffix
Added in Go 1.20 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
@@ -343,8 +343,8 @@ func parseInitVersion(v string) (version string, commit string, _ error) {
|
||||
}
|
||||
}
|
||||
parts[0] = strings.TrimSpace(parts[0])
|
||||
if strings.HasPrefix(parts[0], "tini version ") {
|
||||
version = strings.TrimPrefix(parts[0], "tini version ")
|
||||
if after, ok := strings.CutPrefix(parts[0], "tini version "); ok {
|
||||
version = after
|
||||
}
|
||||
if version == "" && commit == "" {
|
||||
return "", "", errors.Errorf("unknown output format: %s", v)
|
||||
@@ -369,8 +369,8 @@ func parseRuntimeVersion(v string) (runtime, version, commit string, _ error) {
|
||||
version = strings.TrimSpace(s[len(s)-1])
|
||||
continue
|
||||
}
|
||||
if strings.HasPrefix(line, "commit:") {
|
||||
commit = strings.TrimSpace(strings.TrimPrefix(line, "commit:"))
|
||||
if after, ok := strings.CutPrefix(line, "commit:"); ok {
|
||||
commit = strings.TrimSpace(after)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user