Merge pull request #4968 from vrothberg/fork-camelcase

fork fatih/camelcase

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"

go.mod

@@ -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

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
 }

vendor/github.com/fatih/camelcase/.travis.yml

@@ -1,3 +0,0 @@
-language: go
-go: 1.x
-

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