all: drop unnecessary import renames for consistency
Most of our imports already comply with the style, but this change makes it
consistent across the entire repository.
I suspect that these unnecessary imports are left-overs from differences between
Google-internal (where many imports are renamed) and Open Source.
Change-Id: Id5f6eabd22bcc72dd4e36dd018b6cc5138df7696
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/609875
Reviewed-by: Christian Höppner <hoeppi@google.com>
Auto-Submit: Michael Stapelberg <stapelberg@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/internal/editionssupport/editions.go b/internal/editionssupport/editions.go
index 029a6a1..08dad76 100644
--- a/internal/editionssupport/editions.go
+++ b/internal/editionssupport/editions.go
@@ -5,7 +5,7 @@
// Package editionssupport defines constants for editions that are supported.
package editionssupport
-import descriptorpb "google.golang.org/protobuf/types/descriptorpb"
+import "google.golang.org/protobuf/types/descriptorpb"
const (
Minimum = descriptorpb.Edition_EDITION_PROTO2
diff --git a/internal/genid/doc.go b/internal/genid/doc.go
index 45ccd01..d9b9d91 100644
--- a/internal/genid/doc.go
+++ b/internal/genid/doc.go
@@ -6,6 +6,6 @@
// and the well-known types.
package genid
-import protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+import "google.golang.org/protobuf/reflect/protoreflect"
const GoogleProtobuf_package protoreflect.FullName = "google.protobuf"
diff --git a/internal/genid/map_entry.go b/internal/genid/map_entry.go
index 8f9ea02..bef5a25 100644
--- a/internal/genid/map_entry.go
+++ b/internal/genid/map_entry.go
@@ -4,7 +4,7 @@
package genid
-import protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+import "google.golang.org/protobuf/reflect/protoreflect"
// Generic field names and numbers for synthetic map entry messages.
const (
diff --git a/internal/genid/wrappers.go b/internal/genid/wrappers.go
index 429384b..9404270 100644
--- a/internal/genid/wrappers.go
+++ b/internal/genid/wrappers.go
@@ -4,7 +4,7 @@
package genid
-import protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+import "google.golang.org/protobuf/reflect/protoreflect"
// Generic field name and number for messages in wrappers.proto.
const (
diff --git a/internal/impl/encode.go b/internal/impl/encode.go
index febd212..6254f5d 100644
--- a/internal/impl/encode.go
+++ b/internal/impl/encode.go
@@ -10,7 +10,7 @@
"sync/atomic"
"google.golang.org/protobuf/internal/flags"
- proto "google.golang.org/protobuf/proto"
+ "google.golang.org/protobuf/proto"
piface "google.golang.org/protobuf/runtime/protoiface"
)
diff --git a/internal/msgfmt/format_test.go b/internal/msgfmt/format_test.go
index 6ba0768..f3e84db 100644
--- a/internal/msgfmt/format_test.go
+++ b/internal/msgfmt/format_test.go
@@ -20,7 +20,7 @@
testpb "google.golang.org/protobuf/internal/testprotos/test"
textpb "google.golang.org/protobuf/internal/testprotos/textpb2"
dynpb "google.golang.org/protobuf/types/dynamicpb"
- anypb "google.golang.org/protobuf/types/known/anypb"
+ "google.golang.org/protobuf/types/known/anypb"
durpb "google.golang.org/protobuf/types/known/durationpb"
tspb "google.golang.org/protobuf/types/known/timestamppb"
wpb "google.golang.org/protobuf/types/known/wrapperspb"
diff --git a/proto/messageset_test.go b/proto/messageset_test.go
index e634112..a7739a9 100644
--- a/proto/messageset_test.go
+++ b/proto/messageset_test.go
@@ -10,8 +10,8 @@
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/testing/protopack"
- messagesetpb "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
- msetextpb "google.golang.org/protobuf/internal/testprotos/messageset/msetextpb"
+ "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
+ "google.golang.org/protobuf/internal/testprotos/messageset/msetextpb"
)
func init() {
diff --git a/reflect/protodesc/editions.go b/reflect/protodesc/editions.go
index 804830e..002e004 100644
--- a/reflect/protodesc/editions.go
+++ b/reflect/protodesc/editions.go
@@ -14,7 +14,7 @@
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/types/descriptorpb"
- gofeaturespb "google.golang.org/protobuf/types/gofeaturespb"
+ "google.golang.org/protobuf/types/gofeaturespb"
)
var defaults = &descriptorpb.FeatureSetDefaults{}
diff --git a/reflect/protorange/range_test.go b/reflect/protorange/range_test.go
index 678ad13..257d848 100644
--- a/reflect/protorange/range_test.go
+++ b/reflect/protorange/range_test.go
@@ -17,8 +17,8 @@
"google.golang.org/protobuf/testing/protocmp"
newspb "google.golang.org/protobuf/internal/testprotos/news"
- anypb "google.golang.org/protobuf/types/known/anypb"
- timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+ "google.golang.org/protobuf/types/known/anypb"
+ "google.golang.org/protobuf/types/known/timestamppb"
)
func mustMarshal(m proto.Message) []byte {
diff --git a/testing/protocmp/reflect_test.go b/testing/protocmp/reflect_test.go
index 40193dd..22c063c 100644
--- a/testing/protocmp/reflect_test.go
+++ b/testing/protocmp/reflect_test.go
@@ -13,8 +13,8 @@
testpb "google.golang.org/protobuf/internal/testprotos/test"
textpb "google.golang.org/protobuf/internal/testprotos/textpb2"
- anypb "google.golang.org/protobuf/types/known/anypb"
- wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
+ "google.golang.org/protobuf/types/known/anypb"
+ "google.golang.org/protobuf/types/known/wrapperspb"
)
func TestReflect(t *testing.T) {
