all: unify protoV1.ExtensionDesc and proto.ExtensionType

Change protoV1.ExtensionDesc to directly implement ExtensionType
rather than delegating to one.

Unify the previous types protoiface.ExtensionDescV1 and
filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc
type becomes an alias to ExtensionInfo.

This gives us:

  - Just one implementation of ExtensionType.
  - Generated foopb.E_Ext vars are canonical ExtensionTypes.
  - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards
    compatibility.
  - Conversion between legacy and modern representations happens
    transparently when lazily initializing an ExtensionInfo.

Overall, a simplification for users of generated code, since they can
mostly ignore the ExtensionDesc/ExtentionType distinction and use the
same value in either the old or new API.

This is change 3/5 in a series of commits changing protoV1.ExtensionDesc
to directly implement protoreflect.ExtensionType.

1. [v2] Add protoimpl.ExtensionInfo as an alias for
   protoiface.ExtensionDescV1.

2. [v1] Update references to protoimpl.ExtensionInfo to use
   protoiface.ExtensionInfo.

3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in
   the impl package) and remove protoiface.ExtensionDescV1.

4. [v1] Remove unneeded explicit conversions between ExtensionDesc and
   ExtensionType (since the former now directly implements the latter).

5. [v2] Remove stub conversion functions.

Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
index 9c2c056..36bd4aa 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
@@ -3479,7 +3479,7 @@
 	return 0
 }
 
-var file_datasets_google_message3_benchmark_message3_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_datasets_google_message3_benchmark_message3_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*Message16945)(nil),
 		ExtensionType: (*string)(nil),
@@ -4101,171 +4101,171 @@
 // Extension fields to Message16945.
 var (
 	// optional string field17026 = 472;
-	E_Field17026 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[0]
+	E_Field17026 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[0]
 	// repeated string field17027 = 818;
-	E_Field17027 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[1]
+	E_Field17027 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[1]
 	// optional benchmarks.google_message3.Message0 field17031 = 215;
-	E_Field17031 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[2]
+	E_Field17031 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[2]
 	// repeated benchmarks.google_message3.Message0 field17032 = 292;
-	E_Field17032 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[3]
+	E_Field17032 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[3]
 	// repeated benchmarks.google_message3.Message0 field17038 = 234;
-	E_Field17038 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[4]
+	E_Field17038 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[4]
 	// repeated benchmarks.google_message3.Message0 field17039 = 235;
-	E_Field17039 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[5]
+	E_Field17039 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[5]
 	// optional benchmarks.google_message3.Message0 field17042 = 246;
-	E_Field17042 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[6]
+	E_Field17042 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[6]
 	// optional string field17043 = 224;
-	E_Field17043 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[7]
+	E_Field17043 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[7]
 	// optional string field17044 = 225;
-	E_Field17044 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[8]
+	E_Field17044 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[8]
 	// repeated string field17048 = 63;
-	E_Field17048 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[9]
+	E_Field17048 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[9]
 	// repeated string field17049 = 64;
-	E_Field17049 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[10]
+	E_Field17049 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[10]
 	// repeated benchmarks.google_message3.Message0 field17052 = 233;
-	E_Field17052 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[11]
+	E_Field17052 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[11]
 	// repeated benchmarks.google_message3.Message0 field17053 = 66;
-	E_Field17053 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[12]
+	E_Field17053 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[12]
 	// repeated string field17056 = 275;
-	E_Field17056 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[13]
+	E_Field17056 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[13]
 	// optional string field17057 = 226;
-	E_Field17057 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[14]
+	E_Field17057 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[14]
 	// repeated benchmarks.google_message3.Message0 field17060 = 27;
-	E_Field17060 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[15]
+	E_Field17060 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[15]
 	// repeated string field17073 = 75;
-	E_Field17073 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[16]
+	E_Field17073 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[16]
 	// repeated benchmarks.google_message3.Message0 field17076 = 77;
-	E_Field17076 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[17]
+	E_Field17076 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[17]
 	// repeated string field17078 = 296;
-	E_Field17078 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[18]
+	E_Field17078 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[18]
 	// repeated benchmarks.google_message3.Message0 field17082 = 160;
-	E_Field17082 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[19]
+	E_Field17082 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[19]
 	// repeated benchmarks.google_message3.Message0 field17091 = 585;
-	E_Field17091 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[20]
+	E_Field17091 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[20]
 	// repeated benchmarks.google_message3.Message0 field17098 = 987;
-	E_Field17098 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[21]
+	E_Field17098 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[21]
 	// repeated benchmarks.google_message3.Message0 field17101 = 157;
-	E_Field17101 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[22]
+	E_Field17101 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[22]
 	// repeated string field17102 = 158;
-	E_Field17102 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[23]
+	E_Field17102 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[23]
 	// repeated string field17107 = 166;
-	E_Field17107 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[24]
+	E_Field17107 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[24]
 	// repeated string field17133 = 567;
-	E_Field17133 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[25]
+	E_Field17133 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[25]
 	// repeated string field17134 = 572;
-	E_Field17134 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[26]
+	E_Field17134 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[26]
 	// repeated string field17160 = 49;
-	E_Field17160 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[27]
+	E_Field17160 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[27]
 	// repeated string field17168 = 32;
-	E_Field17168 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[28]
+	E_Field17168 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[28]
 	// repeated string field17170 = 34;
-	E_Field17170 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[29]
+	E_Field17170 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[29]
 	// repeated benchmarks.google_message3.Message0 field17172 = 509;
-	E_Field17172 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[30]
+	E_Field17172 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[30]
 	// repeated string field17174 = 39;
-	E_Field17174 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[31]
+	E_Field17174 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[31]
 	// repeated benchmarks.google_message3.Message0 field17175 = 40;
-	E_Field17175 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[32]
+	E_Field17175 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[32]
 	// repeated benchmarks.google_message3.Message0 field17178 = 511;
-	E_Field17178 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[33]
+	E_Field17178 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[33]
 	// repeated benchmarks.google_message3.Message0 field17185 = 50;
-	E_Field17185 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[34]
+	E_Field17185 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[34]
 	// repeated int32 field17207 = 1081;
-	E_Field17207 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[35]
+	E_Field17207 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[35]
 	// repeated benchmarks.google_message3.Message0 field17238 = 184;
-	E_Field17238 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[36]
+	E_Field17238 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[36]
 	// repeated benchmarks.google_message3.Message0 field17289 = 177;
-	E_Field17289 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[37]
+	E_Field17289 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[37]
 	// repeated benchmarks.google_message3.Message0 field17290 = 178;
-	E_Field17290 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[38]
+	E_Field17290 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[38]
 	// repeated benchmarks.google_message3.Message0 field17296 = 474;
-	E_Field17296 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[39]
+	E_Field17296 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[39]
 	// repeated string field17298 = 44;
-	E_Field17298 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[40]
+	E_Field17298 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[40]
 	// repeated benchmarks.google_message3.Message0 field17301 = 47;
-	E_Field17301 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[41]
+	E_Field17301 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[41]
 	// optional benchmarks.google_message3.Message0 field17412 = 21;
-	E_Field17412 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[42]
+	E_Field17412 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[42]
 	// repeated benchmarks.google_message3.Message0 field17438 = 132;
-	E_Field17438 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[43]
+	E_Field17438 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[43]
 	// repeated benchmarks.google_message3.Message0 field17458 = 512;
-	E_Field17458 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[44]
+	E_Field17458 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[44]
 	// repeated string field17460 = 560;
-	E_Field17460 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[45]
+	E_Field17460 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[45]
 	// repeated string field17466 = 552;
-	E_Field17466 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[46]
+	E_Field17466 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[46]
 	// repeated benchmarks.google_message3.Message0 field17617 = 1080;
-	E_Field17617 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[47]
+	E_Field17617 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[47]
 	// repeated int32 field17618 = 1084;
-	E_Field17618 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[48]
+	E_Field17618 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[48]
 )
 
 // Extension fields to Message0.
 var (
 	// optional benchmarks.google_message3.Message1327 field1373 = 23104162;
-	E_Message1327_Field1373 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[49]
+	E_Message1327_Field1373 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[49]
 	// optional benchmarks.google_message3.Message3672 field3737 = 3144435;
-	E_Message3672_Field3737 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[50]
+	E_Message3672_Field3737 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[50]
 	// optional benchmarks.google_message3.Message3804 field3825 = 59241828;
-	E_Message3804_Field3825 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[51]
+	E_Message3804_Field3825 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[51]
 	// optional benchmarks.google_message3.Message6849 field6911 = 107558455;
-	E_Message6849_Field6911 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[52]
+	E_Message6849_Field6911 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[52]
 	// optional benchmarks.google_message3.Message6866 field6974 = 22259060;
-	E_Message6866_Field6974 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[53]
+	E_Message6866_Field6974 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[53]
 	// optional benchmarks.google_message3.Message6870 field6992 = 90034652;
-	E_Message6870_Field6992 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[54]
+	E_Message6870_Field6992 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[54]
 	// optional benchmarks.google_message3.Message7651 field7730 = 55876009;
-	E_Message7651_Field7730 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[55]
+	E_Message7651_Field7730 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[55]
 	// optional benchmarks.google_message3.Message7864 field7872 = 44542730;
-	E_Message7864_Field7872 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[56]
+	E_Message7864_Field7872 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[56]
 	// optional benchmarks.google_message3.Message7929 field7962 = 53392238;
-	E_Message7929_Field7962 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[57]
+	E_Message7929_Field7962 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[57]
 	// optional benchmarks.google_message3.Message8508 field8534 = 3811804;
-	E_Message8508_Field8534 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[58]
+	E_Message8508_Field8534 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[58]
 	// optional benchmarks.google_message3.Message9122 field9134 = 120398939;
-	E_Message9122_Field9134 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[59]
+	E_Message9122_Field9134 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[59]
 	// optional benchmarks.google_message3.Message10177 field10271 = 26801105;
-	E_Message10177_Field10271 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[60]
+	E_Message10177_Field10271 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[60]
 	// optional benchmarks.google_message3.Message11990 field12031 = 21265426;
-	E_Message11990_Field12031 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[64]
+	E_Message11990_Field12031 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[64]
 	// optional benchmarks.google_message3.Message12691 field12716 = 28426536;
-	E_Message12691_Field12716 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[65]
+	E_Message12691_Field12716 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[65]
 	// optional benchmarks.google_message3.Message12870 field12899 = 5447656;
-	E_Message12870_Field12899 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[66]
+	E_Message12870_Field12899 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[66]
 	// optional benchmarks.google_message3.Message16507 field16542 = 5569941;
-	E_Message16507_Field16542 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[68]
+	E_Message16507_Field16542 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[68]
 	// optional benchmarks.google_message3.Message16564 field16569 = 25830030;
-	E_Message16564_Field16569 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[69]
+	E_Message16564_Field16569 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[69]
 	// optional benchmarks.google_message3.Message16661 field16673 = 31274398;
-	E_Message16661_Field16673 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[70]
+	E_Message16661_Field16673 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[70]
 	// optional benchmarks.google_message3.Message16746 field16810 = 28406765;
-	E_Message16746_Field16810 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[71]
+	E_Message16746_Field16810 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[71]
 	// optional benchmarks.google_message3.Message17786 field18176 = 11823055;
-	E_Message17786_Field18176 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[72]
+	E_Message17786_Field18176 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[72]
 	// optional benchmarks.google_message3.Message24404 field24685 = 9129287;
-	E_Message24404_Field24685 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[74]
+	E_Message24404_Field24685 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[74]
 	// optional benchmarks.google_message3.Message27300 field27304 = 24956467;
-	E_Message27300_Field27304 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[75]
+	E_Message27300_Field27304 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[75]
 	// optional benchmarks.google_message3.Message27453 field27482 = 8086204;
-	E_Message27453_Field27482 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[76]
+	E_Message27453_Field27482 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[76]
 )
 
 // Extension fields to Message10155.
 var (
 	// optional benchmarks.google_message3.Message10278 field10289 = 29374161;
-	E_Message10278_Field10289 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[61]
+	E_Message10278_Field10289 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[61]
 	// optional benchmarks.google_message3.Message10323 field10361 = 27922524;
-	E_Message10323_Field10361 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[62]
+	E_Message10323_Field10361 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[62]
 	// optional benchmarks.google_message3.Message10324 field10364 = 27832297;
-	E_Message10324_Field10364 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[63]
+	E_Message10324_Field10364 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[63]
 	// optional benchmarks.google_message3.Message22857 field22875 = 67799715;
-	E_Message22857_Field22875 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[73]
+	E_Message22857_Field22875 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[73]
 )
 
 // Extension fields to Message13145.
 var (
 	// optional benchmarks.google_message3.Message13154 field13166 = 47301086;
-	E_Message13154_Field13166 = &file_datasets_google_message3_benchmark_message3_proto_extDescs[67]
+	E_Message13154_Field13166 = &file_datasets_google_message3_benchmark_message3_proto_extTypes[67]
 )
 
 var File_datasets_google_message3_benchmark_message3_proto protoreflect.FileDescriptor
@@ -6548,7 +6548,7 @@
 		GoTypes:           file_datasets_google_message3_benchmark_message3_proto_goTypes,
 		DependencyIndexes: file_datasets_google_message3_benchmark_message3_proto_depIdxs,
 		MessageInfos:      file_datasets_google_message3_benchmark_message3_proto_msgTypes,
-		LegacyExtensions:  file_datasets_google_message3_benchmark_message3_proto_extDescs,
+		ExtensionInfos:    file_datasets_google_message3_benchmark_message3_proto_extTypes,
 	}.Build()
 	File_datasets_google_message3_benchmark_message3_proto = out.File
 	file_datasets_google_message3_benchmark_message3_proto_rawDesc = nil
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
index 5501358..2edd5ba 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
@@ -6023,7 +6023,7 @@
 	return nil
 }
 
-var file_datasets_google_message3_benchmark_message3_1_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_datasets_google_message3_benchmark_message3_1_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*Message0)(nil),
 		ExtensionType: (*Message34390)(nil),
@@ -6077,17 +6077,17 @@
 // Extension fields to Message0.
 var (
 	// optional benchmarks.google_message3.Message34390 field34453 = 92144610;
-	E_Message34390_Field34453 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[0]
+	E_Message34390_Field34453 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[0]
 	// optional benchmarks.google_message3.Message34624 field34685 = 18178548;
-	E_Message34624_Field34685 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[1]
+	E_Message34624_Field34685 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[1]
 	// optional benchmarks.google_message3.Message34791 field34807 = 6330340;
-	E_Message34791_Field34807 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[2]
+	E_Message34791_Field34807 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[2]
 	// optional benchmarks.google_message3.Message35483 field35505 = 7913554;
-	E_Message35483_Field35505 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[3]
+	E_Message35483_Field35505 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[3]
 	// optional benchmarks.google_message3.Message35807 field35818 = 3803299;
-	E_Message35807_Field35818 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[4]
+	E_Message35807_Field35818 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[4]
 	// optional benchmarks.google_message3.Message16945 field17025 = 22068132;
-	E_Message16945_Field17025 = &file_datasets_google_message3_benchmark_message3_1_proto_extDescs[5]
+	E_Message16945_Field17025 = &file_datasets_google_message3_benchmark_message3_1_proto_extTypes[5]
 )
 
 var File_datasets_google_message3_benchmark_message3_1_proto protoreflect.FileDescriptor
@@ -8872,7 +8872,7 @@
 		GoTypes:           file_datasets_google_message3_benchmark_message3_1_proto_goTypes,
 		DependencyIndexes: file_datasets_google_message3_benchmark_message3_1_proto_depIdxs,
 		MessageInfos:      file_datasets_google_message3_benchmark_message3_1_proto_msgTypes,
-		LegacyExtensions:  file_datasets_google_message3_benchmark_message3_1_proto_extDescs,
+		ExtensionInfos:    file_datasets_google_message3_benchmark_message3_1_proto_extTypes,
 	}.Build()
 	File_datasets_google_message3_benchmark_message3_1_proto = out.File
 	file_datasets_google_message3_benchmark_message3_1_proto_rawDesc = nil
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
index 2c9e1cf..893fd8c 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
@@ -4317,7 +4317,7 @@
 	return 0
 }
 
-var file_datasets_google_message3_benchmark_message3_2_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_datasets_google_message3_benchmark_message3_2_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*Message0)(nil),
 		ExtensionType: (*Message34621)(nil),
@@ -4331,7 +4331,7 @@
 // Extension fields to Message0.
 var (
 	// optional benchmarks.google_message3.Message34621 field34669 = 17562023;
-	E_Message34621_Field34669 = &file_datasets_google_message3_benchmark_message3_2_proto_extDescs[0]
+	E_Message34621_Field34669 = &file_datasets_google_message3_benchmark_message3_2_proto_extTypes[0]
 )
 
 var File_datasets_google_message3_benchmark_message3_2_proto protoreflect.FileDescriptor
@@ -6148,7 +6148,7 @@
 		GoTypes:           file_datasets_google_message3_benchmark_message3_2_proto_goTypes,
 		DependencyIndexes: file_datasets_google_message3_benchmark_message3_2_proto_depIdxs,
 		MessageInfos:      file_datasets_google_message3_benchmark_message3_2_proto_msgTypes,
-		LegacyExtensions:  file_datasets_google_message3_benchmark_message3_2_proto_extDescs,
+		ExtensionInfos:    file_datasets_google_message3_benchmark_message3_2_proto_extTypes,
 	}.Build()
 	File_datasets_google_message3_benchmark_message3_2_proto = out.File
 	file_datasets_google_message3_benchmark_message3_2_proto_rawDesc = nil
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
index 11cc5cf..eb31d78 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
@@ -4430,7 +4430,7 @@
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20, 1}
 }
 
-var file_datasets_google_message3_benchmark_message3_4_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_datasets_google_message3_benchmark_message3_4_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*Message0)(nil),
 		ExtensionType: (*Message33958)(nil),
@@ -4460,19 +4460,19 @@
 // Extension fields to Message0.
 var (
 	// optional benchmarks.google_message3.Message33958 field33981 = 10747482;
-	E_Message33958_Field33981 = &file_datasets_google_message3_benchmark_message3_4_proto_extDescs[0]
+	E_Message33958_Field33981 = &file_datasets_google_message3_benchmark_message3_4_proto_extTypes[0]
 )
 
 // Extension fields to Message8301.
 var (
 	// optional benchmarks.google_message3.Message8454 field8469 = 66;
-	E_Message8454_Field8469 = &file_datasets_google_message3_benchmark_message3_4_proto_extDescs[1]
+	E_Message8454_Field8469 = &file_datasets_google_message3_benchmark_message3_4_proto_extTypes[1]
 )
 
 // Extension fields to Message8302.
 var (
 	// optional benchmarks.google_message3.Message8455 field8474 = 66;
-	E_Message8455_Field8474 = &file_datasets_google_message3_benchmark_message3_4_proto_extDescs[2]
+	E_Message8455_Field8474 = &file_datasets_google_message3_benchmark_message3_4_proto_extTypes[2]
 )
 
 var File_datasets_google_message3_benchmark_message3_4_proto protoreflect.FileDescriptor
@@ -6410,7 +6410,7 @@
 		GoTypes:           file_datasets_google_message3_benchmark_message3_4_proto_goTypes,
 		DependencyIndexes: file_datasets_google_message3_benchmark_message3_4_proto_depIdxs,
 		MessageInfos:      file_datasets_google_message3_benchmark_message3_4_proto_msgTypes,
-		LegacyExtensions:  file_datasets_google_message3_benchmark_message3_4_proto_extDescs,
+		ExtensionInfos:    file_datasets_google_message3_benchmark_message3_4_proto_extTypes,
 	}.Build()
 	File_datasets_google_message3_benchmark_message3_4_proto = out.File
 	file_datasets_google_message3_benchmark_message3_4_proto_rawDesc = nil
diff --git a/internal/testprotos/conformance/test_messages_proto2.pb.go b/internal/testprotos/conformance/test_messages_proto2.pb.go
index 60b7614..ac17ced 100644
--- a/internal/testprotos/conformance/test_messages_proto2.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto2.pb.go
@@ -1407,7 +1407,7 @@
 	return 0
 }
 
-var file_google_protobuf_test_messages_proto2_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_google_protobuf_test_messages_proto2_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*TestAllTypesProto2)(nil),
 		ExtensionType: (*int32)(nil),
@@ -1437,15 +1437,15 @@
 // Extension fields to TestAllTypesProto2.
 var (
 	// optional int32 extension_int32 = 120;
-	E_ExtensionInt32 = &file_google_protobuf_test_messages_proto2_proto_extDescs[0]
+	E_ExtensionInt32 = &file_google_protobuf_test_messages_proto2_proto_extTypes[0]
 )
 
 // Extension fields to TestAllTypesProto2_MessageSetCorrect.
 var (
 	// optional protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension1 message_set_extension = 1547769;
-	E_TestAllTypesProto2_MessageSetCorrectExtension1_MessageSetExtension = &file_google_protobuf_test_messages_proto2_proto_extDescs[1]
+	E_TestAllTypesProto2_MessageSetCorrectExtension1_MessageSetExtension = &file_google_protobuf_test_messages_proto2_proto_extTypes[1]
 	// optional protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension2 message_set_extension = 4135312;
-	E_TestAllTypesProto2_MessageSetCorrectExtension2_MessageSetExtension = &file_google_protobuf_test_messages_proto2_proto_extDescs[2]
+	E_TestAllTypesProto2_MessageSetCorrectExtension2_MessageSetExtension = &file_google_protobuf_test_messages_proto2_proto_extTypes[2]
 )
 
 var File_google_protobuf_test_messages_proto2_proto protoreflect.FileDescriptor
@@ -2262,7 +2262,7 @@
 		DependencyIndexes: file_google_protobuf_test_messages_proto2_proto_depIdxs,
 		EnumInfos:         file_google_protobuf_test_messages_proto2_proto_enumTypes,
 		MessageInfos:      file_google_protobuf_test_messages_proto2_proto_msgTypes,
-		LegacyExtensions:  file_google_protobuf_test_messages_proto2_proto_extDescs,
+		ExtensionInfos:    file_google_protobuf_test_messages_proto2_proto_extTypes,
 	}.Build()
 	File_google_protobuf_test_messages_proto2_proto = out.File
 	file_google_protobuf_test_messages_proto2_proto_rawDesc = nil
diff --git a/internal/testprotos/messageset/msetextpb/msetextpb.pb.go b/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
index 24e07bd..1f3e452 100644
--- a/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
+++ b/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
@@ -10,7 +10,6 @@
 import (
 	messagesetpb "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoiface "google.golang.org/protobuf/runtime/protoiface"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
@@ -108,7 +107,7 @@
 	return 0
 }
 
-var file_messageset_msetextpb_msetextpb_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_messageset_msetextpb_msetextpb_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*messagesetpb.MessageSet)(nil),
 		ExtensionType: (*Ext1)(nil),
@@ -130,9 +129,9 @@
 // Extension fields to messagesetpb.MessageSet.
 var (
 	// optional goproto.proto.messageset.Ext1 message_set_extension = 1000;
-	E_Ext1_MessageSetExtension = &file_messageset_msetextpb_msetextpb_proto_extDescs[0]
+	E_Ext1_MessageSetExtension = &file_messageset_msetextpb_msetextpb_proto_extTypes[0]
 	// optional goproto.proto.messageset.Ext2 message_set_extension = 1001;
-	E_Ext2_MessageSetExtension = &file_messageset_msetextpb_msetextpb_proto_extDescs[1]
+	E_Ext2_MessageSetExtension = &file_messageset_msetextpb_msetextpb_proto_extTypes[1]
 )
 
 var File_messageset_msetextpb_msetextpb_proto protoreflect.FileDescriptor
@@ -248,7 +247,7 @@
 		GoTypes:           file_messageset_msetextpb_msetextpb_proto_goTypes,
 		DependencyIndexes: file_messageset_msetextpb_msetextpb_proto_depIdxs,
 		MessageInfos:      file_messageset_msetextpb_msetextpb_proto_msgTypes,
-		LegacyExtensions:  file_messageset_msetextpb_msetextpb_proto_extDescs,
+		ExtensionInfos:    file_messageset_msetextpb_msetextpb_proto_extTypes,
 	}.Build()
 	File_messageset_msetextpb_msetextpb_proto = out.File
 	file_messageset_msetextpb_msetextpb_proto_rawDesc = nil
diff --git a/internal/testprotos/test/ext.pb.go b/internal/testprotos/test/ext.pb.go
index 6fc92a1..fe3f48d 100644
--- a/internal/testprotos/test/ext.pb.go
+++ b/internal/testprotos/test/ext.pb.go
@@ -9,13 +9,12 @@
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoiface "google.golang.org/protobuf/runtime/protoiface"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
 )
 
-var file_test_ext_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_test_ext_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*TestAllExtensions)(nil),
 		ExtensionType: (*int32)(nil),
@@ -29,7 +28,7 @@
 // Extension fields to TestAllExtensions.
 var (
 	// optional int32 foreign_int32_extension = 2000;
-	E_ForeignInt32Extension = &file_test_ext_proto_extDescs[0]
+	E_ForeignInt32Extension = &file_test_ext_proto_extTypes[0]
 )
 
 var File_test_ext_proto protoreflect.FileDescriptor
@@ -92,7 +91,7 @@
 		},
 		GoTypes:           file_test_ext_proto_goTypes,
 		DependencyIndexes: file_test_ext_proto_depIdxs,
-		LegacyExtensions:  file_test_ext_proto_extDescs,
+		ExtensionInfos:    file_test_ext_proto_extTypes,
 	}.Build()
 	File_test_ext_proto = out.File
 	file_test_ext_proto_rawDesc = nil
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index c6ffb21..dc0b124 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -2383,7 +2383,7 @@
 	return 0
 }
 
-var file_test_test_proto_extDescs = []protoiface.ExtensionDescV1{
+var file_test_test_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*TestAllExtensions)(nil),
 		ExtensionType: (*int32)(nil),
@@ -3045,177 +3045,177 @@
 // Extension fields to TestAllExtensions.
 var (
 	// optional int32 optional_int32_extension = 1;
-	E_OptionalInt32Extension = &file_test_test_proto_extDescs[0]
+	E_OptionalInt32Extension = &file_test_test_proto_extTypes[0]
 	// optional int64 optional_int64_extension = 2;
-	E_OptionalInt64Extension = &file_test_test_proto_extDescs[1]
+	E_OptionalInt64Extension = &file_test_test_proto_extTypes[1]
 	// optional uint32 optional_uint32_extension = 3;
-	E_OptionalUint32Extension = &file_test_test_proto_extDescs[2]
+	E_OptionalUint32Extension = &file_test_test_proto_extTypes[2]
 	// optional uint64 optional_uint64_extension = 4;
-	E_OptionalUint64Extension = &file_test_test_proto_extDescs[3]
+	E_OptionalUint64Extension = &file_test_test_proto_extTypes[3]
 	// optional sint32 optional_sint32_extension = 5;
-	E_OptionalSint32Extension = &file_test_test_proto_extDescs[4]
+	E_OptionalSint32Extension = &file_test_test_proto_extTypes[4]
 	// optional sint64 optional_sint64_extension = 6;
-	E_OptionalSint64Extension = &file_test_test_proto_extDescs[5]
+	E_OptionalSint64Extension = &file_test_test_proto_extTypes[5]
 	// optional fixed32 optional_fixed32_extension = 7;
-	E_OptionalFixed32Extension = &file_test_test_proto_extDescs[6]
+	E_OptionalFixed32Extension = &file_test_test_proto_extTypes[6]
 	// optional fixed64 optional_fixed64_extension = 8;
-	E_OptionalFixed64Extension = &file_test_test_proto_extDescs[7]
+	E_OptionalFixed64Extension = &file_test_test_proto_extTypes[7]
 	// optional sfixed32 optional_sfixed32_extension = 9;
-	E_OptionalSfixed32Extension = &file_test_test_proto_extDescs[8]
+	E_OptionalSfixed32Extension = &file_test_test_proto_extTypes[8]
 	// optional sfixed64 optional_sfixed64_extension = 10;
-	E_OptionalSfixed64Extension = &file_test_test_proto_extDescs[9]
+	E_OptionalSfixed64Extension = &file_test_test_proto_extTypes[9]
 	// optional float optional_float_extension = 11;
-	E_OptionalFloatExtension = &file_test_test_proto_extDescs[10]
+	E_OptionalFloatExtension = &file_test_test_proto_extTypes[10]
 	// optional double optional_double_extension = 12;
-	E_OptionalDoubleExtension = &file_test_test_proto_extDescs[11]
+	E_OptionalDoubleExtension = &file_test_test_proto_extTypes[11]
 	// optional bool optional_bool_extension = 13;
-	E_OptionalBoolExtension = &file_test_test_proto_extDescs[12]
+	E_OptionalBoolExtension = &file_test_test_proto_extTypes[12]
 	// optional string optional_string_extension = 14;
-	E_OptionalStringExtension = &file_test_test_proto_extDescs[13]
+	E_OptionalStringExtension = &file_test_test_proto_extTypes[13]
 	// optional bytes optional_bytes_extension = 15;
-	E_OptionalBytesExtension = &file_test_test_proto_extDescs[14]
+	E_OptionalBytesExtension = &file_test_test_proto_extTypes[14]
 	// optional goproto.proto.test.OptionalGroup_extension optionalgroup_extension = 16;
-	E_OptionalgroupExtension = &file_test_test_proto_extDescs[15]
+	E_OptionalgroupExtension = &file_test_test_proto_extTypes[15]
 	// optional goproto.proto.test.TestAllTypes.NestedMessage optional_nested_message_extension = 18;
-	E_OptionalNestedMessageExtension = &file_test_test_proto_extDescs[16]
+	E_OptionalNestedMessageExtension = &file_test_test_proto_extTypes[16]
 	// optional goproto.proto.test.TestAllTypes.NestedEnum optional_nested_enum_extension = 21;
-	E_OptionalNestedEnumExtension = &file_test_test_proto_extDescs[17]
+	E_OptionalNestedEnumExtension = &file_test_test_proto_extTypes[17]
 	// repeated int32 repeated_int32_extension = 31;
-	E_RepeatedInt32Extension = &file_test_test_proto_extDescs[18]
+	E_RepeatedInt32Extension = &file_test_test_proto_extTypes[18]
 	// repeated int64 repeated_int64_extension = 32;
-	E_RepeatedInt64Extension = &file_test_test_proto_extDescs[19]
+	E_RepeatedInt64Extension = &file_test_test_proto_extTypes[19]
 	// repeated uint32 repeated_uint32_extension = 33;
-	E_RepeatedUint32Extension = &file_test_test_proto_extDescs[20]
+	E_RepeatedUint32Extension = &file_test_test_proto_extTypes[20]
 	// repeated uint64 repeated_uint64_extension = 34;
-	E_RepeatedUint64Extension = &file_test_test_proto_extDescs[21]
+	E_RepeatedUint64Extension = &file_test_test_proto_extTypes[21]
 	// repeated sint32 repeated_sint32_extension = 35;
-	E_RepeatedSint32Extension = &file_test_test_proto_extDescs[22]
+	E_RepeatedSint32Extension = &file_test_test_proto_extTypes[22]
 	// repeated sint64 repeated_sint64_extension = 36;
-	E_RepeatedSint64Extension = &file_test_test_proto_extDescs[23]
+	E_RepeatedSint64Extension = &file_test_test_proto_extTypes[23]
 	// repeated fixed32 repeated_fixed32_extension = 37;
-	E_RepeatedFixed32Extension = &file_test_test_proto_extDescs[24]
+	E_RepeatedFixed32Extension = &file_test_test_proto_extTypes[24]
 	// repeated fixed64 repeated_fixed64_extension = 38;
-	E_RepeatedFixed64Extension = &file_test_test_proto_extDescs[25]
+	E_RepeatedFixed64Extension = &file_test_test_proto_extTypes[25]
 	// repeated sfixed32 repeated_sfixed32_extension = 39;
-	E_RepeatedSfixed32Extension = &file_test_test_proto_extDescs[26]
+	E_RepeatedSfixed32Extension = &file_test_test_proto_extTypes[26]
 	// repeated sfixed64 repeated_sfixed64_extension = 40;
-	E_RepeatedSfixed64Extension = &file_test_test_proto_extDescs[27]
+	E_RepeatedSfixed64Extension = &file_test_test_proto_extTypes[27]
 	// repeated float repeated_float_extension = 41;
-	E_RepeatedFloatExtension = &file_test_test_proto_extDescs[28]
+	E_RepeatedFloatExtension = &file_test_test_proto_extTypes[28]
 	// repeated double repeated_double_extension = 42;
-	E_RepeatedDoubleExtension = &file_test_test_proto_extDescs[29]
+	E_RepeatedDoubleExtension = &file_test_test_proto_extTypes[29]
 	// repeated bool repeated_bool_extension = 43;
-	E_RepeatedBoolExtension = &file_test_test_proto_extDescs[30]
+	E_RepeatedBoolExtension = &file_test_test_proto_extTypes[30]
 	// repeated string repeated_string_extension = 44;
-	E_RepeatedStringExtension = &file_test_test_proto_extDescs[31]
+	E_RepeatedStringExtension = &file_test_test_proto_extTypes[31]
 	// repeated bytes repeated_bytes_extension = 45;
-	E_RepeatedBytesExtension = &file_test_test_proto_extDescs[32]
+	E_RepeatedBytesExtension = &file_test_test_proto_extTypes[32]
 	// repeated goproto.proto.test.RepeatedGroup_extension repeatedgroup_extension = 46;
-	E_RepeatedgroupExtension = &file_test_test_proto_extDescs[33]
+	E_RepeatedgroupExtension = &file_test_test_proto_extTypes[33]
 	// repeated goproto.proto.test.TestAllTypes.NestedMessage repeated_nested_message_extension = 48;
-	E_RepeatedNestedMessageExtension = &file_test_test_proto_extDescs[34]
+	E_RepeatedNestedMessageExtension = &file_test_test_proto_extTypes[34]
 	// repeated goproto.proto.test.TestAllTypes.NestedEnum repeated_nested_enum_extension = 51;
-	E_RepeatedNestedEnumExtension = &file_test_test_proto_extDescs[35]
+	E_RepeatedNestedEnumExtension = &file_test_test_proto_extTypes[35]
 	// optional int32 default_int32_extension = 81;
-	E_DefaultInt32Extension = &file_test_test_proto_extDescs[36]
+	E_DefaultInt32Extension = &file_test_test_proto_extTypes[36]
 	// optional int64 default_int64_extension = 82;
-	E_DefaultInt64Extension = &file_test_test_proto_extDescs[37]
+	E_DefaultInt64Extension = &file_test_test_proto_extTypes[37]
 	// optional uint32 default_uint32_extension = 83;
-	E_DefaultUint32Extension = &file_test_test_proto_extDescs[38]
+	E_DefaultUint32Extension = &file_test_test_proto_extTypes[38]
 	// optional uint64 default_uint64_extension = 84;
-	E_DefaultUint64Extension = &file_test_test_proto_extDescs[39]
+	E_DefaultUint64Extension = &file_test_test_proto_extTypes[39]
 	// optional sint32 default_sint32_extension = 85;
-	E_DefaultSint32Extension = &file_test_test_proto_extDescs[40]
+	E_DefaultSint32Extension = &file_test_test_proto_extTypes[40]
 	// optional sint64 default_sint64_extension = 86;
-	E_DefaultSint64Extension = &file_test_test_proto_extDescs[41]
+	E_DefaultSint64Extension = &file_test_test_proto_extTypes[41]
 	// optional fixed32 default_fixed32_extension = 87;
-	E_DefaultFixed32Extension = &file_test_test_proto_extDescs[42]
+	E_DefaultFixed32Extension = &file_test_test_proto_extTypes[42]
 	// optional fixed64 default_fixed64_extension = 88;
-	E_DefaultFixed64Extension = &file_test_test_proto_extDescs[43]
+	E_DefaultFixed64Extension = &file_test_test_proto_extTypes[43]
 	// optional sfixed32 default_sfixed32_extension = 89;
-	E_DefaultSfixed32Extension = &file_test_test_proto_extDescs[44]
+	E_DefaultSfixed32Extension = &file_test_test_proto_extTypes[44]
 	// optional sfixed64 default_sfixed64_extension = 80;
-	E_DefaultSfixed64Extension = &file_test_test_proto_extDescs[45]
+	E_DefaultSfixed64Extension = &file_test_test_proto_extTypes[45]
 	// optional float default_float_extension = 91;
-	E_DefaultFloatExtension = &file_test_test_proto_extDescs[46]
+	E_DefaultFloatExtension = &file_test_test_proto_extTypes[46]
 	// optional double default_double_extension = 92;
-	E_DefaultDoubleExtension = &file_test_test_proto_extDescs[47]
+	E_DefaultDoubleExtension = &file_test_test_proto_extTypes[47]
 	// optional bool default_bool_extension = 93;
-	E_DefaultBoolExtension = &file_test_test_proto_extDescs[48]
+	E_DefaultBoolExtension = &file_test_test_proto_extTypes[48]
 	// optional string default_string_extension = 94;
-	E_DefaultStringExtension = &file_test_test_proto_extDescs[49]
+	E_DefaultStringExtension = &file_test_test_proto_extTypes[49]
 	// optional bytes default_bytes_extension = 95;
-	E_DefaultBytesExtension = &file_test_test_proto_extDescs[50]
+	E_DefaultBytesExtension = &file_test_test_proto_extTypes[50]
 	// optional string nested_string_extension = 1003;
-	E_TestNestedExtension_NestedStringExtension = &file_test_test_proto_extDescs[79]
+	E_TestNestedExtension_NestedStringExtension = &file_test_test_proto_extTypes[79]
 	// optional goproto.proto.test.TestRequired single = 1000;
-	E_TestRequired_Single = &file_test_test_proto_extDescs[80]
+	E_TestRequired_Single = &file_test_test_proto_extTypes[80]
 	// repeated goproto.proto.test.TestRequired multi = 1001;
-	E_TestRequired_Multi = &file_test_test_proto_extDescs[81]
+	E_TestRequired_Multi = &file_test_test_proto_extTypes[81]
 )
 
 // Extension fields to TestPackedExtensions.
 var (
 	// repeated int32 packed_int32_extension = 90;
-	E_PackedInt32Extension = &file_test_test_proto_extDescs[51]
+	E_PackedInt32Extension = &file_test_test_proto_extTypes[51]
 	// repeated int64 packed_int64_extension = 91;
-	E_PackedInt64Extension = &file_test_test_proto_extDescs[52]
+	E_PackedInt64Extension = &file_test_test_proto_extTypes[52]
 	// repeated uint32 packed_uint32_extension = 92;
-	E_PackedUint32Extension = &file_test_test_proto_extDescs[53]
+	E_PackedUint32Extension = &file_test_test_proto_extTypes[53]
 	// repeated uint64 packed_uint64_extension = 93;
-	E_PackedUint64Extension = &file_test_test_proto_extDescs[54]
+	E_PackedUint64Extension = &file_test_test_proto_extTypes[54]
 	// repeated sint32 packed_sint32_extension = 94;
-	E_PackedSint32Extension = &file_test_test_proto_extDescs[55]
+	E_PackedSint32Extension = &file_test_test_proto_extTypes[55]
 	// repeated sint64 packed_sint64_extension = 95;
-	E_PackedSint64Extension = &file_test_test_proto_extDescs[56]
+	E_PackedSint64Extension = &file_test_test_proto_extTypes[56]
 	// repeated fixed32 packed_fixed32_extension = 96;
-	E_PackedFixed32Extension = &file_test_test_proto_extDescs[57]
+	E_PackedFixed32Extension = &file_test_test_proto_extTypes[57]
 	// repeated fixed64 packed_fixed64_extension = 97;
-	E_PackedFixed64Extension = &file_test_test_proto_extDescs[58]
+	E_PackedFixed64Extension = &file_test_test_proto_extTypes[58]
 	// repeated sfixed32 packed_sfixed32_extension = 98;
-	E_PackedSfixed32Extension = &file_test_test_proto_extDescs[59]
+	E_PackedSfixed32Extension = &file_test_test_proto_extTypes[59]
 	// repeated sfixed64 packed_sfixed64_extension = 99;
-	E_PackedSfixed64Extension = &file_test_test_proto_extDescs[60]
+	E_PackedSfixed64Extension = &file_test_test_proto_extTypes[60]
 	// repeated float packed_float_extension = 100;
-	E_PackedFloatExtension = &file_test_test_proto_extDescs[61]
+	E_PackedFloatExtension = &file_test_test_proto_extTypes[61]
 	// repeated double packed_double_extension = 101;
-	E_PackedDoubleExtension = &file_test_test_proto_extDescs[62]
+	E_PackedDoubleExtension = &file_test_test_proto_extTypes[62]
 	// repeated bool packed_bool_extension = 102;
-	E_PackedBoolExtension = &file_test_test_proto_extDescs[63]
+	E_PackedBoolExtension = &file_test_test_proto_extTypes[63]
 	// repeated goproto.proto.test.ForeignEnum packed_enum_extension = 103;
-	E_PackedEnumExtension = &file_test_test_proto_extDescs[64]
+	E_PackedEnumExtension = &file_test_test_proto_extTypes[64]
 )
 
 // Extension fields to TestUnpackedExtensions.
 var (
 	// repeated int32 unpacked_int32_extension = 90;
-	E_UnpackedInt32Extension = &file_test_test_proto_extDescs[65]
+	E_UnpackedInt32Extension = &file_test_test_proto_extTypes[65]
 	// repeated int64 unpacked_int64_extension = 91;
-	E_UnpackedInt64Extension = &file_test_test_proto_extDescs[66]
+	E_UnpackedInt64Extension = &file_test_test_proto_extTypes[66]
 	// repeated uint32 unpacked_uint32_extension = 92;
-	E_UnpackedUint32Extension = &file_test_test_proto_extDescs[67]
+	E_UnpackedUint32Extension = &file_test_test_proto_extTypes[67]
 	// repeated uint64 unpacked_uint64_extension = 93;
-	E_UnpackedUint64Extension = &file_test_test_proto_extDescs[68]
+	E_UnpackedUint64Extension = &file_test_test_proto_extTypes[68]
 	// repeated sint32 unpacked_sint32_extension = 94;
-	E_UnpackedSint32Extension = &file_test_test_proto_extDescs[69]
+	E_UnpackedSint32Extension = &file_test_test_proto_extTypes[69]
 	// repeated sint64 unpacked_sint64_extension = 95;
-	E_UnpackedSint64Extension = &file_test_test_proto_extDescs[70]
+	E_UnpackedSint64Extension = &file_test_test_proto_extTypes[70]
 	// repeated fixed32 unpacked_fixed32_extension = 96;
-	E_UnpackedFixed32Extension = &file_test_test_proto_extDescs[71]
+	E_UnpackedFixed32Extension = &file_test_test_proto_extTypes[71]
 	// repeated fixed64 unpacked_fixed64_extension = 97;
-	E_UnpackedFixed64Extension = &file_test_test_proto_extDescs[72]
+	E_UnpackedFixed64Extension = &file_test_test_proto_extTypes[72]
 	// repeated sfixed32 unpacked_sfixed32_extension = 98;
-	E_UnpackedSfixed32Extension = &file_test_test_proto_extDescs[73]
+	E_UnpackedSfixed32Extension = &file_test_test_proto_extTypes[73]
 	// repeated sfixed64 unpacked_sfixed64_extension = 99;
-	E_UnpackedSfixed64Extension = &file_test_test_proto_extDescs[74]
+	E_UnpackedSfixed64Extension = &file_test_test_proto_extTypes[74]
 	// repeated float unpacked_float_extension = 100;
-	E_UnpackedFloatExtension = &file_test_test_proto_extDescs[75]
+	E_UnpackedFloatExtension = &file_test_test_proto_extTypes[75]
 	// repeated double unpacked_double_extension = 101;
-	E_UnpackedDoubleExtension = &file_test_test_proto_extDescs[76]
+	E_UnpackedDoubleExtension = &file_test_test_proto_extTypes[76]
 	// repeated bool unpacked_bool_extension = 102;
-	E_UnpackedBoolExtension = &file_test_test_proto_extDescs[77]
+	E_UnpackedBoolExtension = &file_test_test_proto_extTypes[77]
 	// repeated goproto.proto.test.ForeignEnum unpacked_enum_extension = 103;
-	E_UnpackedEnumExtension = &file_test_test_proto_extDescs[78]
+	E_UnpackedEnumExtension = &file_test_test_proto_extTypes[78]
 )
 
 var File_test_test_proto protoreflect.FileDescriptor
@@ -4986,7 +4986,7 @@
 		DependencyIndexes: file_test_test_proto_depIdxs,
 		EnumInfos:         file_test_test_proto_enumTypes,
 		MessageInfos:      file_test_test_proto_msgTypes,
-		LegacyExtensions:  file_test_test_proto_extDescs,
+		ExtensionInfos:    file_test_test_proto_extTypes,
 	}.Build()
 	File_test_test_proto = out.File
 	file_test_test_proto_rawDesc = nil