goprotobuf: Style updates for text.go and text_test.go.
R=r
CC=golang-dev
http://codereview.appspot.com/4774041
diff --git a/proto/testdata/test.pb.go b/proto/testdata/test.pb.go
index 9eb7027..56453b9 100644
--- a/proto/testdata/test.pb.go
+++ b/proto/testdata/test.pb.go
@@ -12,7 +12,6 @@
var _ = math.Inf
var _ os.Error
-
type FOO int32
const (
diff --git a/proto/text.go b/proto/text.go
index f7f8f5f..54a89f7 100644
--- a/proto/text.go
+++ b/proto/text.go
@@ -127,19 +127,17 @@
continue
}
- if props.Repeated {
- if fv.Kind() == reflect.Slice {
- // Repeated field.
- for j := 0; j < fv.Len(); j++ {
- writeName(w, props)
- if !w.compact {
- w.WriteByte(' ')
- }
- writeAny(w, fv.Index(j), props)
- w.WriteByte('\n')
+ if props.Repeated && fv.Kind() == reflect.Slice {
+ // Repeated field.
+ for j := 0; j < fv.Len(); j++ {
+ writeName(w, props)
+ if !w.compact {
+ w.WriteByte(' ')
}
- continue
+ writeAny(w, fv.Index(j), props)
+ w.WriteByte('\n')
}
+ continue
}
writeName(w, props)
diff --git a/proto/text_test.go b/proto/text_test.go
index 1427740..6c3f546 100644
--- a/proto/text_test.go
+++ b/proto/text_test.go
@@ -33,44 +33,46 @@
import (
"bytes"
- . "goprotobuf.googlecode.com/hg/proto"
- . "./testdata/_obj/test_proto"
"testing"
+
+ "goprotobuf.googlecode.com/hg/proto"
+
+ pb "./testdata/_obj/test_proto"
)
-func newTestMessage() *MyMessage {
- msg := &MyMessage{
- Count: Int32(42),
- Name: String("Dave"),
- Quote: String(`"I didn't want to go."`),
+func newTestMessage() *pb.MyMessage {
+ msg := &pb.MyMessage{
+ Count: proto.Int32(42),
+ Name: proto.String("Dave"),
+ Quote: proto.String(`"I didn't want to go."`),
Pet: []string{"bunny", "kitty", "horsey"},
- Inner: &InnerMessage{
- Host: String("footrest.syd"),
- Port: Int32(7001),
- Connected: Bool(true),
+ Inner: &pb.InnerMessage{
+ Host: proto.String("footrest.syd"),
+ Port: proto.Int32(7001),
+ Connected: proto.Bool(true),
},
- Others: []*OtherMessage{
- &OtherMessage{
- Key: Int64(0xdeadbeef),
+ Others: []*pb.OtherMessage{
+ &pb.OtherMessage{
+ Key: proto.Int64(0xdeadbeef),
Value: []byte{1, 65, 7, 12},
},
- &OtherMessage{
- Weight: Float32(6.022),
- Inner: &InnerMessage{
- Host: String("lesha.mtv"),
- Port: Int32(8002),
+ &pb.OtherMessage{
+ Weight: proto.Float32(6.022),
+ Inner: &pb.InnerMessage{
+ Host: proto.String("lesha.mtv"),
+ Port: proto.Int32(8002),
},
},
},
- Bikeshed: NewMyMessage_Color(MyMessage_BLUE),
- Somegroup: &MyMessage_SomeGroup{
- GroupField: Int32(8),
+ Bikeshed: pb.NewMyMessage_Color(pb.MyMessage_BLUE),
+ Somegroup: &pb.MyMessage_SomeGroup{
+ GroupField: proto.Int32(8),
},
}
- ext := &Ext{
- Data: String("Big gobs for big rats"),
+ ext := &pb.Ext{
+ Data: proto.String("Big gobs for big rats"),
}
- if err := SetExtension(msg, E_Ext_More, ext); err != nil {
+ if err := proto.SetExtension(msg, pb.E_Ext_More, ext); err != nil {
panic(err)
}
return msg
@@ -109,7 +111,7 @@
func TestMarshalTextFull(t *testing.T) {
buf := new(bytes.Buffer)
- MarshalText(buf, newTestMessage())
+ proto.MarshalText(buf, newTestMessage())
s := buf.String()
if s != text {
t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, text)
@@ -151,7 +153,7 @@
var compactText = compact(text)
func TestCompactText(t *testing.T) {
- s := CompactTextString(newTestMessage())
+ s := proto.CompactTextString(newTestMessage())
if s != compactText {
t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, compactText)
}