Refactor usages

gogo · Feb 20, 2017 · 57ba2fa · 57ba2fa
1 parent afccd71
commit 57ba2fa
Show file tree

Hide file tree

Showing 131 changed files with 186 additions and 190 deletions.
diff --git a/_conformance/conformance_proto/conformance.pb.go b/_conformance/conformance_proto/conformance.pb.go
diff --git a/gogoproto/gogo.pb.go b/gogoproto/gogo.pb.go
diff --git a/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
diff --git a/proto/proto3_proto/proto3.pb.go b/proto/proto3_proto/proto3.pb.go
diff --git a/proto/testdata/test.pb.go b/proto/testdata/test.pb.go
diff --git a/protoc-gen-gogo/descriptor/descriptor.pb.go b/protoc-gen-gogo/descriptor/descriptor.pb.go
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
@@ -2745,7 +2745,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 				} else if gogoproto.IsStdDuration(field) {
 					pkg := g.useTypes()
 					if gogoproto.IsNullable(field) {
-						g.UseTime()
 						g.P(`dAtA, err := `, pkg, `.StdDurationMarshal(*`, val, `)`)
 					} else {
 						g.P(`dAtA, err := `, pkg, `.StdDurationMarshal(`, val, `)`)
@@ -2869,8 +2868,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 				g.P(`return true, err`)
 				g.Out()
 				g.P(`}`)
-				g.P(`c := new(time.Time)`)
-				g.UseTime()
+				g.P(`c := new(`, g.UseTime(), `.Time)`)
 				g.P(`if err2 := `, pkg, `.StdTimeUnmarshal(c, `, val, `); err2 != nil {`)
 				g.In()
 				g.P(`return true, err`)
@@ -2879,14 +2877,12 @@ func (g *Generator) generateMessage(message *Descriptor) {
 				val = "c"
 			} else if gogoproto.IsStdDuration(field) {
 				pkg := g.useTypes()
-				g.UseTime()
 				g.P(`if err != nil {`)
 				g.In()
 				g.P(`return true, err`)
 				g.Out()
 				g.P(`}`)
-				g.P(`c := new(time.Duration)`)
-				g.UseTime()
+				g.P(`c := new(`, g.UseTime(), `.Duration)`)
 				g.P(`if err2 := `, pkg, `.StdDurationUnmarshal(c, `, val, `); err2 != nil {`)
 				g.In()
 				g.P(`return true, err`)

diff --git a/protoc-gen-gogo/plugin/plugin.pb.go b/protoc-gen-gogo/plugin/plugin.pb.go
diff --git a/protoc-gen-gogo/testdata/my_test/test.pb.go b/protoc-gen-gogo/testdata/my_test/test.pb.go
diff --git a/test/asymetric-issue125/asym.pb.go b/test/asymetric-issue125/asym.pb.go
diff --git a/test/casttype/combos/both/casttype.pb.go b/test/casttype/combos/both/casttype.pb.go
diff --git a/test/casttype/combos/marshaler/casttype.pb.go b/test/casttype/combos/marshaler/casttype.pb.go
diff --git a/test/casttype/combos/neither/casttype.pb.go b/test/casttype/combos/neither/casttype.pb.go
diff --git a/test/casttype/combos/unmarshaler/casttype.pb.go b/test/casttype/combos/unmarshaler/casttype.pb.go
diff --git a/test/casttype/combos/unsafeboth/casttype.pb.go b/test/casttype/combos/unsafeboth/casttype.pb.go
diff --git a/test/casttype/combos/unsafemarshaler/casttype.pb.go b/test/casttype/combos/unsafemarshaler/casttype.pb.go
diff --git a/test/casttype/combos/unsafeunmarshaler/casttype.pb.go b/test/casttype/combos/unsafeunmarshaler/casttype.pb.go
diff --git a/test/castvalue/castvalue.pb.go b/test/castvalue/castvalue.pb.go