all: trivial formatting changes
Changes:
* import grouping for third-party dependencies
* import grouping for generated protobufs
* blank space removal
Change-Id: I2950b0606bb2064046d79a23a78b05c23147cbfe
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/221017
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/compiler/protogen/protogen_test.go b/compiler/protogen/protogen_test.go
index c3982c5..6f08b2e 100644
--- a/compiler/protogen/protogen_test.go
+++ b/compiler/protogen/protogen_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/encoding/protojson/encode_test.go b/encoding/protojson/encode_test.go
index d0a343e..df2fbc9 100644
--- a/encoding/protojson/encode_test.go
+++ b/encoding/protojson/encode_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/internal/detrand"
"google.golang.org/protobuf/internal/encoding/pack"
diff --git a/encoding/prototext/encode_test.go b/encoding/prototext/encode_test.go
index db113bc..8b821e1 100644
--- a/encoding/prototext/encode_test.go
+++ b/encoding/prototext/encode_test.go
@@ -9,6 +9,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/detrand"
"google.golang.org/protobuf/internal/encoding/pack"
diff --git a/internal/encoding/json/decode_number.go b/internal/encoding/json/decode_number.go
index a695689..2999d71 100644
--- a/internal/encoding/json/decode_number.go
+++ b/internal/encoding/json/decode_number.go
@@ -221,7 +221,6 @@
for i := 0; i < exp-fracSize; i++ {
num = append(num, '0')
}
-
} else {
// For negative E, shift digits in integer part out.
diff --git a/internal/encoding/json/decode_test.go b/internal/encoding/json/decode_test.go
index b788c39..d70c3de 100644
--- a/internal/encoding/json/decode_test.go
+++ b/internal/encoding/json/decode_test.go
@@ -12,6 +12,7 @@
"unicode/utf8"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/internal/encoding/json"
)
diff --git a/internal/encoding/json/encode_test.go b/internal/encoding/json/encode_test.go
index d6616c7..5370f8b 100644
--- a/internal/encoding/json/encode_test.go
+++ b/internal/encoding/json/encode_test.go
@@ -11,6 +11,7 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+
"google.golang.org/protobuf/internal/detrand"
"google.golang.org/protobuf/internal/encoding/json"
)
diff --git a/internal/encoding/pack/pack_test.go b/internal/encoding/pack/pack_test.go
index 2e76b51..8a3d069 100644
--- a/internal/encoding/pack/pack_test.go
+++ b/internal/encoding/pack/pack_test.go
@@ -12,6 +12,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
pdesc "google.golang.org/protobuf/reflect/protodesc"
pref "google.golang.org/protobuf/reflect/protoreflect"
diff --git a/internal/encoding/text/decode_test.go b/internal/encoding/text/decode_test.go
index 4749f8c..3f8047f 100644
--- a/internal/encoding/text/decode_test.go
+++ b/internal/encoding/text/decode_test.go
@@ -12,6 +12,7 @@
"unicode/utf8"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/internal/encoding/text"
"google.golang.org/protobuf/internal/flags"
)
diff --git a/internal/encoding/text/encode_test.go b/internal/encoding/text/encode_test.go
index b9ad92a..2588b1b 100644
--- a/internal/encoding/text/encode_test.go
+++ b/internal/encoding/text/encode_test.go
@@ -11,6 +11,7 @@
"unicode/utf8"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/internal/detrand"
"google.golang.org/protobuf/internal/encoding/text"
)
diff --git a/internal/filedesc/desc_test.go b/internal/filedesc/desc_test.go
index 08930a2..57a693c 100644
--- a/internal/filedesc/desc_test.go
+++ b/internal/filedesc/desc_test.go
@@ -13,6 +13,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
detrand "google.golang.org/protobuf/internal/detrand"
"google.golang.org/protobuf/internal/filedesc"
"google.golang.org/protobuf/proto"
diff --git a/internal/impl/extension_test.go b/internal/impl/extension_test.go
index 6f83d03..171f312 100644
--- a/internal/impl/extension_test.go
+++ b/internal/impl/extension_test.go
@@ -9,6 +9,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/proto"
pref "google.golang.org/protobuf/reflect/protoreflect"
diff --git a/internal/impl/legacy_aberrant_test.go b/internal/impl/legacy_aberrant_test.go
index 9786207..c51b0c7 100644
--- a/internal/impl/legacy_aberrant_test.go
+++ b/internal/impl/legacy_aberrant_test.go
@@ -11,6 +11,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/reflect/protodesc"
diff --git a/internal/impl/legacy_file_test.go b/internal/impl/legacy_file_test.go
index bc18648..e59f0a0 100644
--- a/internal/impl/legacy_file_test.go
+++ b/internal/impl/legacy_file_test.go
@@ -12,6 +12,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/internal/pragma"
"google.golang.org/protobuf/proto"
diff --git a/internal/impl/legacy_test.go b/internal/impl/legacy_test.go
index 16bbafd..f699568 100644
--- a/internal/impl/legacy_test.go
+++ b/internal/impl/legacy_test.go
@@ -12,6 +12,7 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
+
"google.golang.org/protobuf/encoding/prototext"
pimpl "google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/internal/pragma"
diff --git a/internal/impl/message_reflect_test.go b/internal/impl/message_reflect_test.go
index 26c271d..66c2536 100644
--- a/internal/impl/message_reflect_test.go
+++ b/internal/impl/message_reflect_test.go
@@ -15,6 +15,7 @@
cmp "github.com/google/go-cmp/cmp"
cmpopts "github.com/google/go-cmp/cmp/cmpopts"
+
"google.golang.org/protobuf/encoding/prototext"
pimpl "google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/proto"
diff --git a/internal/protobuild/build.go b/internal/protobuild/build.go
index 8790d5f..cb2f4a5 100644
--- a/internal/protobuild/build.go
+++ b/internal/protobuild/build.go
@@ -98,7 +98,6 @@
v.(Message).Build(m.Mutable(fd).Message())
}
}
-
}
}
diff --git a/proto/encode_test.go b/proto/encode_test.go
index edef139..80e8f5d 100644
--- a/proto/encode_test.go
+++ b/proto/encode_test.go
@@ -12,6 +12,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/encoding/wire"
"google.golang.org/protobuf/proto"
diff --git a/proto/extension_test.go b/proto/extension_test.go
index b434206..0c58cc3 100644
--- a/proto/extension_test.go
+++ b/proto/extension_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/proto"
pref "google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/runtime/protoimpl"
@@ -64,7 +65,6 @@
if proto.HasExtension(test.message, test.ext) {
t.Errorf("%v:\nafter clearing extension HasExtension(...) = true, want false", desc)
}
-
}
}
diff --git a/proto/merge_test.go b/proto/merge_test.go
index 48d8a41..2f2b4ba 100644
--- a/proto/merge_test.go
+++ b/proto/merge_test.go
@@ -11,6 +11,7 @@
"testing"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/encoding/pack"
"google.golang.org/protobuf/internal/protobuild"
@@ -645,7 +646,6 @@
if !proto.Equal(dst, want) {
t.Fatalf("mutation observed after modifying source:\n got %v\nwant %v\ndiff (-want,+got):\n%v", dst, want, cmp.Diff(want, dst, protocmp.Transform()))
}
-
})
}
}
diff --git a/testing/protocmp/util_test.go b/testing/protocmp/util_test.go
index 9b40e66..1206592 100644
--- a/testing/protocmp/util_test.go
+++ b/testing/protocmp/util_test.go
@@ -10,10 +10,11 @@
"github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/internal/encoding/pack"
- testpb "google.golang.org/protobuf/internal/testprotos/test"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/types/dynamicpb"
+
+ testpb "google.golang.org/protobuf/internal/testprotos/test"
)
func TestEqual(t *testing.T) {
