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 <[email protected]> Auto-Submit: Michael Stapelberg <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
protocolbuffers · Aug 30, 2024 · 013dd17 · 013dd17
1 parent 1531843
commit 013dd17
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -10,7 +10,7 @@ import (
 	"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
@@ -20,7 +20,7 @@ import (
 	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
@@ -10,8 +10,8 @@ import (
 	"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
@@ -14,7 +14,7 @@ import (
 	"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
@@ -17,8 +17,8 @@ import (
 	"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
@@ -13,8 +13,8 @@ import (
 
 	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) {