update proto library prior to avoid New* methods.
diffs generated automatically from Google-internal copy.
all tests pass
R=rsc, dsymonds1
CC=dsymonds
http://codereview.appspot.com/1908042
diff --git a/compiler/generator/generator.go b/compiler/generator/generator.go
index c2c6297..33bb9c0 100644
--- a/compiler/generator/generator.go
+++ b/compiler/generator/generator.go
@@ -909,17 +909,12 @@
g.Out()
g.P("}")
- // Reset and New functions
+ // Reset function
g.P("func (this *", ccTypeName, ") Reset() {")
g.In()
g.P("*this = ", ccTypeName, "{}")
g.Out()
g.P("}")
- g.P("func New", ccTypeName, "() *", ccTypeName, " {")
- g.In()
- g.P("return new(", ccTypeName, ")")
- g.Out()
- g.P("}")
// Extension support methods
if len(message.ExtensionRange) > 0 {
diff --git a/compiler/testdata/extension_test.go b/compiler/testdata/extension_test.go
index 6ff10ca..85c7d56 100644
--- a/compiler/testdata/extension_test.go
+++ b/compiler/testdata/extension_test.go
@@ -42,7 +42,7 @@
)
func TestSingleFieldExtension(t *testing.T) {
- bm := base.NewBaseMessage()
+ bm := &base.BaseMessage{}
bm.Height = proto.Int32(178)
// Use extension within scope of another type.
@@ -55,7 +55,7 @@
if err != nil {
t.Fatal("Failed encoding message with extension:", err)
}
- bm_new := base.NewBaseMessage()
+ bm_new := &base.BaseMessage{}
if err := proto.Unmarshal(buf, bm_new); err != nil {
t.Fatal("Failed decoding message with extension:", err)
}
@@ -76,7 +76,7 @@
}
func TestMessageExtension(t *testing.T) {
- bm := base.NewBaseMessage()
+ bm := &base.BaseMessage{}
bm.Height = proto.Int32(179)
// Use extension that is itself a message.
@@ -92,7 +92,7 @@
if err != nil {
t.Fatal("Failed encoding message with extension:", err)
}
- bm_new := base.NewBaseMessage()
+ bm_new := &base.BaseMessage{}
if err := proto.Unmarshal(buf, bm_new); err != nil {
t.Fatal("Failed decoding message with extension:", err)
}
@@ -116,7 +116,7 @@
}
func TestTopLevelExtension(t *testing.T) {
- bm := base.NewBaseMessage()
+ bm := &base.BaseMessage{}
bm.Height = proto.Int32(179)
width := proto.Int32(17)
@@ -128,7 +128,7 @@
if err != nil {
t.Fatal("Failed encoding message with extension:", err)
}
- bm_new := base.NewBaseMessage()
+ bm_new := &base.BaseMessage{}
if err := proto.Unmarshal(buf, bm_new); err != nil {
t.Fatal("Failed decoding message with extension:", err)
}
diff --git a/compiler/testdata/main.go b/compiler/testdata/main.go
index 29100be..ed81320 100644
--- a/compiler/testdata/main.go
+++ b/compiler/testdata/main.go
@@ -39,6 +39,6 @@
)
func main() {
- _ = my_test.NewRequest()
- _ = multitest.NewMulti1()
+ _ = &my_test.Request{}
+ _ = &multitest.Multi1{}
}
diff --git a/compiler/testdata/test.pb.go.golden b/compiler/testdata/test.pb.go.golden
index 397bea4..36284f0 100644
--- a/compiler/testdata/test.pb.go.golden
+++ b/compiler/testdata/test.pb.go.golden
@@ -98,9 +98,6 @@
func (this *Request) Reset() {
*this = Request{}
}
-func NewRequest() *Request {
- return new(Request)
-}
const Default_Request_Hat HatType = HatType_FEDORA
type Reply struct {
@@ -111,9 +108,6 @@
func (this *Reply) Reset() {
*this = Reply{}
}
-func NewReply() *Reply {
- return new(Reply)
-}
var extRange_Reply = []proto.ExtensionRange{
proto.ExtensionRange{100, 536870911},
@@ -137,9 +131,6 @@
func (this *Reply_Entry) Reset() {
*this = Reply_Entry{}
}
-func NewReply_Entry() *Reply_Entry {
- return new(Reply_Entry)
-}
const Default_Reply_Entry_Value int64 = 7
type ReplyExtensions struct {
@@ -148,9 +139,6 @@
func (this *ReplyExtensions) Reset() {
*this = ReplyExtensions{}
}
-func NewReplyExtensions() *ReplyExtensions {
- return new(ReplyExtensions)
-}
var E_ReplyExtensions_Time = &proto.ExtensionDesc{
ExtendedType: (*Reply)(nil),