github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117753 from humblec/mitchelle

Browse Source 
dependencies: update gh/mitchellh/go-wordwrap
This commit is contained in:
Kubernetes Prow Robot 2023-05-16 08:11:36 -07:00 committed by GitHub
commit d91fd5138e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -190,7 +190,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect

4
go.sum
View File

@ -499,8 +499,8 @@ github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceT
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=

2
staging/src/k8s.io/kubectl/go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/jonboulle/clockwork v0.2.2 github.com/jonboulle/clockwork v0.2.2
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
github.com/lithammer/dedent v1.1.0 github.com/lithammer/dedent v1.1.0
github.com/mitchellh/go-wordwrap v1.0.0 github.com/mitchellh/go-wordwrap v1.0.1
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 github.com/moby/term v0.0.0-20221205130635-1aeaba878587
github.com/onsi/ginkgo/v2 v2.9.4 github.com/onsi/ginkgo/v2 v2.9.4
github.com/onsi/gomega v1.27.6 github.com/onsi/gomega v1.27.6

4
staging/src/k8s.io/kubectl/go.sum generated
View File

@ -194,8 +194,8 @@ github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffkt
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=

26
vendor/github.com/mitchellh/go-wordwrap/wordwrap.go generated vendored
View File

@ -5,6 +5,8 @@ import (
"unicode" "unicode"
) )
const nbsp = 0xA0
// WrapString wraps the given string within lim width in characters. // WrapString wraps the given string within lim width in characters.
// //
// Wrapping is currently naive and only happens at white-space. A future // Wrapping is currently naive and only happens at white-space. A future
@ -18,50 +20,58 @@ func WrapString(s string, lim uint) string {
var current uint var current uint
var wordBuf, spaceBuf bytes.Buffer var wordBuf, spaceBuf bytes.Buffer
var wordBufLen, spaceBufLen uint
for _, char := range s { for _, char := range s {
if char == '\n' { if char == '\n' {
if wordBuf.Len() == 0 { if wordBuf.Len() == 0 {
if current+uint(spaceBuf.Len()) > lim { if current+spaceBufLen > lim {
current = 0 current = 0
} else { } else {
current += uint(spaceBuf.Len()) current += spaceBufLen
spaceBuf.WriteTo(buf) spaceBuf.WriteTo(buf)
} }
spaceBuf.Reset() spaceBuf.Reset()
spaceBufLen = 0
} else { } else {
current += uint(spaceBuf.Len() + wordBuf.Len()) current += spaceBufLen + wordBufLen
spaceBuf.WriteTo(buf) spaceBuf.WriteTo(buf)
spaceBuf.Reset() spaceBuf.Reset()
spaceBufLen = 0
wordBuf.WriteTo(buf) wordBuf.WriteTo(buf)
wordBuf.Reset() wordBuf.Reset()
wordBufLen = 0
} }
buf.WriteRune(char) buf.WriteRune(char)
current = 0 current = 0
} else if unicode.IsSpace(char) { } else if unicode.IsSpace(char) && char != nbsp {
if spaceBuf.Len() == 0 || wordBuf.Len() > 0 { if spaceBuf.Len() == 0 || wordBuf.Len() > 0 {
current += uint(spaceBuf.Len() + wordBuf.Len()) current += spaceBufLen + wordBufLen
spaceBuf.WriteTo(buf) spaceBuf.WriteTo(buf)
spaceBuf.Reset() spaceBuf.Reset()
spaceBufLen = 0
wordBuf.WriteTo(buf) wordBuf.WriteTo(buf)
wordBuf.Reset() wordBuf.Reset()
wordBufLen = 0
} }
spaceBuf.WriteRune(char) spaceBuf.WriteRune(char)
spaceBufLen++
} else { } else {
wordBuf.WriteRune(char) wordBuf.WriteRune(char)
wordBufLen++
if current+uint(spaceBuf.Len()+wordBuf.Len()) > lim && uint(wordBuf.Len()) < lim { if current+wordBufLen+spaceBufLen > lim && wordBufLen < lim {
buf.WriteRune('\n') buf.WriteRune('\n')
current = 0 current = 0
spaceBuf.Reset() spaceBuf.Reset()
spaceBufLen = 0
} }
} }
} }
if wordBuf.Len() == 0 { if wordBuf.Len() == 0 {
if current+uint(spaceBuf.Len()) <= lim { if current+spaceBufLen <= lim {
spaceBuf.WriteTo(buf) spaceBuf.WriteTo(buf)
} }
} else { } else {

4
vendor/modules.txt vendored
View File

@ -472,8 +472,8 @@ github.com/matttproud/golang_protobuf_extensions/pbutil
# github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible # github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
## explicit ## explicit
github.com/mistifyio/go-zfs github.com/mistifyio/go-zfs
# github.com/mitchellh/go-wordwrap v1.0.0 # github.com/mitchellh/go-wordwrap v1.0.1
## explicit ## explicit; go 1.14
github.com/mitchellh/go-wordwrap github.com/mitchellh/go-wordwrap
# github.com/moby/ipvs v1.1.0 # github.com/moby/ipvs v1.1.0
## explicit; go 1.17 ## explicit; go 1.17