diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-25 22:05:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 22:05:02 -0800 |
| commit | 0800ab4f6510a629047de9ead10d4b0d002b99d9 (patch) | |
| tree | e82755d54abd5c77f7968f5ed77b8d4aec97430b | |
| parent | 975854ad5c79346c72615030249c1f2bf8aecde0 (diff) | |
| parent | e3ad92f85d36d3e6ca005b0367bc6657071d6a8a (diff) | |
| download | podman-0800ab4f6510a629047de9ead10d4b0d002b99d9.tar.gz podman-0800ab4f6510a629047de9ead10d4b0d002b99d9.tar.bz2 podman-0800ab4f6510a629047de9ead10d4b0d002b99d9.zip | |
Merge pull request #4968 from vrothberg/fork-camelcase
fork fatih/camelcase
| -rw-r--r-- | cmd/podman/common.go | 2 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | pkg/util/camelcase/LICENSE.md (renamed from vendor/github.com/fatih/camelcase/LICENSE.md) | 0 | ||||
| -rw-r--r-- | pkg/util/camelcase/README.md (renamed from vendor/github.com/fatih/camelcase/README.md) | 0 | ||||
| -rw-r--r-- | pkg/util/camelcase/camelcase.go (renamed from vendor/github.com/fatih/camelcase/camelcase.go) | 5 | ||||
| -rw-r--r-- | vendor/github.com/fatih/camelcase/.travis.yml | 3 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
7 files changed, 5 insertions, 9 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index f3aff1d49..46feae90d 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -12,7 +12,7 @@ import ( "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/sysinfo" - "github.com/fatih/camelcase" + "github.com/containers/libpod/pkg/util/camelcase" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -29,7 +29,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect github.com/elazarl/goproxy/ext v0.0.0-20190911111923-ecfe977594f1 // indirect github.com/etcd-io/bbolt v1.3.3 - github.com/fatih/camelcase v1.0.0 + github.com/fatih/camelcase v1.0.0 // indirect github.com/fsnotify/fsnotify v1.4.7 github.com/ghodss/yaml v1.0.0 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e diff --git a/vendor/github.com/fatih/camelcase/LICENSE.md b/pkg/util/camelcase/LICENSE.md index aa4a536ca..aa4a536ca 100644 --- a/vendor/github.com/fatih/camelcase/LICENSE.md +++ b/pkg/util/camelcase/LICENSE.md diff --git a/vendor/github.com/fatih/camelcase/README.md b/pkg/util/camelcase/README.md index 105a6ae33..105a6ae33 100644 --- a/vendor/github.com/fatih/camelcase/README.md +++ b/pkg/util/camelcase/README.md diff --git a/vendor/github.com/fatih/camelcase/camelcase.go b/pkg/util/camelcase/camelcase.go index 02160c9a4..0a82d1005 100644 --- a/vendor/github.com/fatih/camelcase/camelcase.go +++ b/pkg/util/camelcase/camelcase.go @@ -55,7 +55,7 @@ func Split(src string) (entries []string) { class := 0 // split into fields based on class of unicode character for _, r := range src { - switch true { + switch { case unicode.IsLower(r): class = 1 case unicode.IsUpper(r): @@ -86,5 +86,6 @@ func Split(src string) (entries []string) { entries = append(entries, string(s)) } } - return + + return entries } diff --git a/vendor/github.com/fatih/camelcase/.travis.yml b/vendor/github.com/fatih/camelcase/.travis.yml deleted file mode 100644 index 3489e3871..000000000 --- a/vendor/github.com/fatih/camelcase/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: go -go: 1.x - diff --git a/vendor/modules.txt b/vendor/modules.txt index 2aa86270a..e28bbd41d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -261,8 +261,6 @@ github.com/docker/spdystream github.com/docker/spdystream/spdy # github.com/etcd-io/bbolt v1.3.3 github.com/etcd-io/bbolt -# github.com/fatih/camelcase v1.0.0 -github.com/fatih/camelcase # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify # github.com/fsouza/go-dockerclient v1.6.0 |