remove semis after statements in one-statement statement lists

R=rsc, r
http://go/go-review/1025029

1 files changed, 40 insertions, 40 deletions

diff --git a/src/pkg/gob/encoder_test.go b/src/pkg/gob/encoder_test.go
index 5f12b172f..e850bceae 100644
--- a/src/pkg/gob/encoder_test.go
+++ b/src/pkg/gob/encoder_test.go
@@ -44,7 +44,7 @@ func TestBasicEncoder(t *testing.T) {
 	et1.et2 = new(ET2);
 	enc.Encode(et1);
 	if enc.state.err != nil {
-		t.Error("encoder fail:", enc.state.err);
+		t.Error("encoder fail:", enc.state.err)
 	}
 
 	// Decode the result by hand to verify;
@@ -53,98 +53,98 @@ func TestBasicEncoder(t *testing.T) {
 	// 0) The length, 38.
 	length := decodeUint(state);
 	if length != 38 {
-		t.Fatal("0. expected length 38; got", length);
+		t.Fatal("0. expected length 38; got", length)
 	}
 	// 1) -7: the type id of ET1
 	id1 := decodeInt(state);
 	if id1 >= 0 {
-		t.Fatal("expected ET1 negative id; got", id1);
+		t.Fatal("expected ET1 negative id; got", id1)
 	}
 	// 2) The wireType for ET1
 	wire1 := new(wireType);
 	err := decode(b, tWireType, wire1);
 	if err != nil {
-		t.Fatal("error decoding ET1 type:", err);
+		t.Fatal("error decoding ET1 type:", err)
 	}
 	info := getTypeInfoNoError(reflect.Typeof(ET1{}));
 	trueWire1 := &wireType{s: info.id.gobType().(*structType)};
 	if !reflect.DeepEqual(wire1, trueWire1) {
-		t.Fatalf("invalid wireType for ET1: expected %+v; got %+v\n", *trueWire1, *wire1);
+		t.Fatalf("invalid wireType for ET1: expected %+v; got %+v\n", *trueWire1, *wire1)
 	}
 	// 3) The length, 21.
 	length = decodeUint(state);
 	if length != 21 {
-		t.Fatal("3. expected length 21; got", length);
+		t.Fatal("3. expected length 21; got", length)
 	}
 	// 4) -8: the type id of ET2
 	id2 := decodeInt(state);
 	if id2 >= 0 {
-		t.Fatal("expected ET2 negative id; got", id2);
+		t.Fatal("expected ET2 negative id; got", id2)
 	}
 	// 5) The wireType for ET2
 	wire2 := new(wireType);
 	err = decode(b, tWireType, wire2);
 	if err != nil {
-		t.Fatal("error decoding ET2 type:", err);
+		t.Fatal("error decoding ET2 type:", err)
 	}
 	info = getTypeInfoNoError(reflect.Typeof(ET2{}));
 	trueWire2 := &wireType{s: info.id.gobType().(*structType)};
 	if !reflect.DeepEqual(wire2, trueWire2) {
-		t.Fatalf("invalid wireType for ET2: expected %+v; got %+v\n", *trueWire2, *wire2);
+		t.Fatalf("invalid wireType for ET2: expected %+v; got %+v\n", *trueWire2, *wire2)
 	}
 	// 6) The length, 6.
 	length = decodeUint(state);
 	if length != 6 {
-		t.Fatal("6. expected length 6; got", length);
+		t.Fatal("6. expected length 6; got", length)
 	}
 	// 7) The type id for the et1 value
 	newId1 := decodeInt(state);
 	if newId1 != -id1 {
-		t.Fatal("expected Et1 id", -id1, "got", newId1);
+		t.Fatal("expected Et1 id", -id1, "got", newId1)
 	}
 	// 8) The value of et1
 	newEt1 := new(ET1);
 	et1Id := getTypeInfoNoError(reflect.Typeof(*newEt1)).id;
 	err = decode(b, et1Id, newEt1);
 	if err != nil {
-		t.Fatal("error decoding ET1 value:", err);
+		t.Fatal("error decoding ET1 value:", err)
 	}
 	if !reflect.DeepEqual(et1, newEt1) {
-		t.Fatalf("invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1);
+		t.Fatalf("invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1)
 	}
 	// 9) EOF
 	if b.Len() != 0 {
-		t.Error("not at eof;", b.Len(), "bytes left");
+		t.Error("not at eof;", b.Len(), "bytes left")
 	}
 
 	// Now do it again. This time we should see only the type id and value.
 	b.Reset();
 	enc.Encode(et1);
 	if enc.state.err != nil {
-		t.Error("2nd round: encoder fail:", enc.state.err);
+		t.Error("2nd round: encoder fail:", enc.state.err)
 	}
 	// The length.
 	length = decodeUint(state);
 	if length != 6 {
-		t.Fatal("6. expected length 6; got", length);
+		t.Fatal("6. expected length 6; got", length)
 	}
 	// 5a) The type id for the et1 value
 	newId1 = decodeInt(state);
 	if newId1 != -id1 {
-		t.Fatal("2nd round: expected Et1 id", -id1, "got", newId1);
+		t.Fatal("2nd round: expected Et1 id", -id1, "got", newId1)
 	}
 	// 6a) The value of et1
 	newEt1 = new(ET1);
 	err = decode(b, et1Id, newEt1);
 	if err != nil {
-		t.Fatal("2nd round: error decoding ET1 value:", err);
+		t.Fatal("2nd round: error decoding ET1 value:", err)
 	}
 	if !reflect.DeepEqual(et1, newEt1) {
-		t.Fatalf("2nd round: invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1);
+		t.Fatalf("2nd round: invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1)
 	}
 	// 7a) EOF
 	if b.Len() != 0 {
-		t.Error("2nd round: not at eof;", b.Len(), "bytes left");
+		t.Error("2nd round: not at eof;", b.Len(), "bytes left")
 	}
 }
 
@@ -156,44 +156,44 @@ func TestEncoderDecoder(t *testing.T) {
 	et1.et2 = new(ET2);
 	enc.Encode(et1);
 	if enc.state.err != nil {
-		t.Error("encoder fail:", enc.state.err);
+		t.Error("encoder fail:", enc.state.err)
 	}
 	dec := NewDecoder(b);
 	newEt1 := new(ET1);
 	dec.Decode(newEt1);
 	if dec.state.err != nil {
-		t.Fatal("error decoding ET1:", dec.state.err);
+		t.Fatal("error decoding ET1:", dec.state.err)
 	}
 
 	if !reflect.DeepEqual(et1, newEt1) {
-		t.Fatalf("invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1);
+		t.Fatalf("invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1)
 	}
 	if b.Len() != 0 {
-		t.Error("not at eof;", b.Len(), "bytes left");
+		t.Error("not at eof;", b.Len(), "bytes left")
 	}
 
 	enc.Encode(et1);
 	newEt1 = new(ET1);
 	dec.Decode(newEt1);
 	if dec.state.err != nil {
-		t.Fatal("round 2: error decoding ET1:", dec.state.err);
+		t.Fatal("round 2: error decoding ET1:", dec.state.err)
 	}
 	if !reflect.DeepEqual(et1, newEt1) {
-		t.Fatalf("round 2: invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1);
+		t.Fatalf("round 2: invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1)
 	}
 	if b.Len() != 0 {
-		t.Error("round 2: not at eof;", b.Len(), "bytes left");
+		t.Error("round 2: not at eof;", b.Len(), "bytes left")
 	}
 
 	// Now test with a running encoder/decoder pair that we recognize a type mismatch.
 	enc.Encode(et1);
 	if enc.state.err != nil {
-		t.Error("round 3: encoder fail:", enc.state.err);
+		t.Error("round 3: encoder fail:", enc.state.err)
 	}
 	newEt2 := new(ET2);
 	dec.Decode(newEt2);
 	if dec.state.err == nil {
-		t.Fatal("round 3: expected `bad type' error decoding ET2");
+		t.Fatal("round 3: expected `bad type' error decoding ET2")
 	}
 }
 
@@ -207,15 +207,15 @@ func badTypeCheck(e interface{}, shouldFail bool, msg string, t *testing.T) {
 	et1.et2 = new(ET2);
 	enc.Encode(et1);
 	if enc.state.err != nil {
-		t.Error("encoder fail:", enc.state.err);
+		t.Error("encoder fail:", enc.state.err)
 	}
 	dec := NewDecoder(b);
 	dec.Decode(e);
 	if shouldFail && (dec.state.err == nil) {
-		t.Error("expected error for", msg);
+		t.Error("expected error for", msg)
 	}
 	if !shouldFail && (dec.state.err != nil) {
-		t.Error("unexpected error for", msg);
+		t.Error("unexpected error for", msg)
 	}
 }
 
@@ -231,7 +231,7 @@ func corruptDataCheck(s string, err os.Error, t *testing.T) {
 	dec := NewDecoder(b);
 	dec.Decode(new(ET2));
 	if dec.state.err != err {
-		t.Error("expected error", err, "got", dec.state.err);
+		t.Error("expected error", err, "got", dec.state.err)
 	}
 }
 
@@ -262,7 +262,7 @@ func TestUnsupported(t *testing.T) {
 	for _, v := range unsupportedValues {
 		err := enc.Encode(v);
 		if err == nil {
-			t.Errorf("expected error for %T; got none", v);
+			t.Errorf("expected error for %T; got none", v)
 		}
 	}
 }
@@ -272,12 +272,12 @@ func encAndDec(in, out interface{}) os.Error {
 	enc := NewEncoder(b);
 	enc.Encode(in);
 	if enc.state.err != nil {
-		return enc.state.err;
+		return enc.state.err
 	}
 	dec := NewDecoder(b);
 	dec.Decode(out);
 	if dec.state.err != nil {
-		return dec.state.err;
+		return dec.state.err
 	}
 	return nil;
 }
@@ -290,7 +290,7 @@ func TestTypeToPtrType(t *testing.T) {
 	t0 := Type0{7};
 	t0p := (*Type0)(nil);
 	if err := encAndDec(t0, t0p); err != nil {
-		t.Error(err);
+		t.Error(err)
 	}
 }
 
@@ -302,7 +302,7 @@ func TestPtrTypeToType(t *testing.T) {
 	t1p := &Type1{17};
 	var t1 Type1;
 	if err := encAndDec(t1, t1p); err != nil {
-		t.Error(err);
+		t.Error(err)
 	}
 }
 
@@ -319,9 +319,9 @@ func TestTypeToPtrPtrPtrPtrType(t *testing.T) {
 	****t2.a = 27.4;
 	t2pppp := new(***Type2);
 	if err := encAndDec(t2, t2pppp); err != nil {
-		t.Error(err);
+		t.Error(err)
 	}
 	if ****(****t2pppp).a != ****t2.a {
-		t.Errorf("wrong value after decode: %g not %g", ****(****t2pppp).a, ****t2.a);
+		t.Errorf("wrong value after decode: %g not %g", ****(****t2pppp).a, ****t2.a)
 	}
 }