diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7d3c90337ac..cd08991ce97 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1723,42 +1723,34 @@ }, { "ImportPath": "github.com/google/certificate-transparency-go", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/asn1", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/client", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/client/configpb", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/jsonclient", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/tls", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/x509", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { "ImportPath": "github.com/google/certificate-transparency-go/x509/pkix", - "Comment": "v1.0.10", "Rev": "1bec4527572c443752ad4f2830bef88be0533236" }, { @@ -2000,7 +1992,6 @@ }, { "ImportPath": "github.com/inconshreveable/mousetrap", - "Comment": "v1.0", "Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" }, { @@ -2870,7 +2861,6 @@ }, { "ImportPath": "github.com/xiang90/probing", - "Comment": "0.0.1", "Rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2" }, { @@ -3312,43 +3302,43 @@ }, { "ImportPath": "k8s.io/gengo/args", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/import-boss/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/sets", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/generator", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/namer", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/parser", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/types", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/heapster/metrics/api/v1/types", diff --git a/staging/src/k8s.io/code-generator/Godeps/Godeps.json b/staging/src/k8s.io/code-generator/Godeps/Godeps.json index 65b137455c0..7eaed9d3e45 100644 --- a/staging/src/k8s.io/code-generator/Godeps/Godeps.json +++ b/staging/src/k8s.io/code-generator/Godeps/Godeps.json @@ -220,43 +220,43 @@ }, { "ImportPath": "k8s.io/gengo/args", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/import-boss/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/generators", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/sets", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/generator", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/namer", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/parser", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/gengo/types", - "Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" + "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", diff --git a/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go b/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go index c77255bf557..dec7dcaf733 100644 --- a/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go +++ b/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go @@ -781,12 +781,12 @@ func (g *genDeepCopy) doSlice(t *types.Type, sw *generator.SnippetWriter) { } else { sw.Do("for i := range *in {\n", nil) if uet.Kind == types.Slice || uet.Kind == types.Map || uet.Kind == types.Pointer || deepCopyMethodOrDie(ut.Elem) != nil || deepCopyIntoMethodOrDie(ut.Elem) != nil { - sw.Do("if (*in)[i] == nil { (*out)[i] = nil } else {\n", nil) + sw.Do("if (*in)[i] != nil {\n", nil) sw.Do("in, out := &(*in)[i], &(*out)[i]\n", nil) g.generateFor(ut.Elem, sw) sw.Do("}\n", nil) } else if uet.Kind == types.Interface { - sw.Do("if (*in)[i] == nil {(*out)[i]=nil} else {\n", nil) + sw.Do("if (*in)[i] != nil {\n", nil) // Note: if t.Elem has been an alias "J" of an interface "I" in Go, we will see it // as kind Interface of name "J" here, i.e. generate val.DeepCopyJ(). The golang // parser does not give us the underlying interface name. So we cannot do any better. @@ -856,7 +856,7 @@ func (g *genDeepCopy) doStruct(t *types.Type, sw *generator.SnippetWriter) { sw.Do("in.$.name$.DeepCopyInto(&out.$.name$)\n", args) } case uft.Kind == types.Interface: - sw.Do("if in.$.name$ == nil {out.$.name$=nil} else {\n", args) + sw.Do("if in.$.name$ != nil {\n", args) // Note: if t.Elem has been an alias "J" of an interface "I" in Go, we will see it // as kind Interface of name "J" here, i.e. generate val.DeepCopyJ(). The golang // parser does not give us the underlying interface name. So we cannot do any better. diff --git a/vendor/k8s.io/gengo/generator/import_tracker.go b/vendor/k8s.io/gengo/generator/import_tracker.go index 70d59b1e2ac..bbd82137dd7 100644 --- a/vendor/k8s.io/gengo/generator/import_tracker.go +++ b/vendor/k8s.io/gengo/generator/import_tracker.go @@ -47,13 +47,12 @@ func golangTrackerLocalName(tracker namer.ImportTracker, t types.Name) string { dirs := strings.Split(path, namer.GoSeperator) for n := len(dirs) - 1; n >= 0; n-- { - // TODO: bikeshed about whether it's more readable to have an - // _, something else, or nothing between directory names. - name := strings.Join(dirs[n:], "_") + // follow kube convention of not having anything between directory names + name := strings.Join(dirs[n:], "") // These characters commonly appear in import paths for go // packages, but aren't legal go names. So we'll sanitize. - name = strings.Replace(name, ".", "_", -1) - name = strings.Replace(name, "-", "_", -1) + name = strings.Replace(name, ".", "", -1) + name = strings.Replace(name, "-", "", -1) if _, found := tracker.PathOf(name); found { // This name collides with some other package continue