diff --git a/pb-jelly-gen/src/codegen.rs b/pb-jelly-gen/src/codegen.rs index cd9eb3d..04e02f5 100644 --- a/pb-jelly-gen/src/codegen.rs +++ b/pb-jelly-gen/src/codegen.rs @@ -1392,7 +1392,7 @@ impl<'a, 'ctx> CodeWriter<'a, 'ctx> { }); }); - block(ctx, "lazy_static!", |ctx| { + block(ctx, "::lazy_static::lazy_static!", |ctx| { ctx.write(format!( "pub static ref {name}_default: {escaped_name} = {escaped_name}::default();" )); @@ -2442,8 +2442,6 @@ impl<'a> Context<'a> { for crate_name in self.deps_map.borrow().keys() { let mut librs = String::new(); - writeln!(&mut librs, "#[macro_use]").unwrap(); - writeln!(&mut librs, "extern crate lazy_static;").unwrap(); if derive_serde { writeln!(&mut librs, "#[macro_use]").unwrap(); writeln!(&mut librs, "extern crate serde;").unwrap(); diff --git a/pb-jelly-gen/src/lib.rs b/pb-jelly-gen/src/lib.rs index d872a67..2414f9e 100644 --- a/pb-jelly-gen/src/lib.rs +++ b/pb-jelly-gen/src/lib.rs @@ -50,9 +50,6 @@ use std::{ }; use walkdir::WalkDir; -#[macro_use] -extern crate lazy_static; - pub mod codegen; /// Don't depend on this module, it's only public so that `protoc-gen-jellyrust` can use it #[doc(hidden)] diff --git a/pb-jelly-gen/src/protos.rs b/pb-jelly-gen/src/protos.rs index 5fc5adb..2aea7a1 100644 --- a/pb-jelly-gen/src/protos.rs +++ b/pb-jelly-gen/src/protos.rs @@ -187,7 +187,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref Version_default: Version = Version::default(); } impl ::pb_jelly::Message for Version { @@ -456,7 +456,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref CodeGeneratorRequest_default: CodeGeneratorRequest = CodeGeneratorRequest::default(); } impl ::pb_jelly::Message for CodeGeneratorRequest { @@ -716,7 +716,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref CodeGeneratorResponse_default: CodeGeneratorResponse = CodeGeneratorResponse::default(); } impl ::pb_jelly::Message for CodeGeneratorResponse { @@ -972,7 +972,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref CodeGeneratorResponse_File_default: CodeGeneratorResponse_File = CodeGeneratorResponse_File::default(); } impl ::pb_jelly::Message for CodeGeneratorResponse_File { @@ -3165,7 +3165,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FileDescriptorSet_default: FileDescriptorSet = FileDescriptorSet::default(); } impl ::pb_jelly::Message for FileDescriptorSet { @@ -3451,7 +3451,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FileDescriptorProto_default: FileDescriptorProto = FileDescriptorProto::default(); } impl ::pb_jelly::Message for FileDescriptorProto { @@ -4033,7 +4033,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref DescriptorProto_default: DescriptorProto = DescriptorProto::default(); } impl ::pb_jelly::Message for DescriptorProto { @@ -4431,7 +4431,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref DescriptorProto_ExtensionRange_default: DescriptorProto_ExtensionRange = DescriptorProto_ExtensionRange::default(); } impl ::pb_jelly::Message for DescriptorProto_ExtensionRange { @@ -4602,7 +4602,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref DescriptorProto_ReservedRange_default: DescriptorProto_ReservedRange = DescriptorProto_ReservedRange::default(); } impl ::pb_jelly::Message for DescriptorProto_ReservedRange { @@ -4779,7 +4779,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref ExtensionRangeOptions_default: ExtensionRangeOptions = ExtensionRangeOptions::default(); } impl ::pb_jelly::Message for ExtensionRangeOptions { @@ -5038,7 +5038,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref ExtensionRangeOptions_Declaration_default: ExtensionRangeOptions_Declaration = ExtensionRangeOptions_Declaration::default(); } impl ::pb_jelly::Message for ExtensionRangeOptions_Declaration { @@ -5419,7 +5419,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FieldDescriptorProto_default: FieldDescriptorProto = FieldDescriptorProto::default(); } impl ::pb_jelly::Message for FieldDescriptorProto { @@ -5823,7 +5823,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref OneofDescriptorProto_default: OneofDescriptorProto = OneofDescriptorProto::default(); } impl ::pb_jelly::Message for OneofDescriptorProto { @@ -6019,7 +6019,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref EnumDescriptorProto_default: EnumDescriptorProto = EnumDescriptorProto::default(); } impl ::pb_jelly::Message for EnumDescriptorProto { @@ -6259,7 +6259,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref EnumDescriptorProto_EnumReservedRange_default: EnumDescriptorProto_EnumReservedRange = EnumDescriptorProto_EnumReservedRange::default(); } impl ::pb_jelly::Message for EnumDescriptorProto_EnumReservedRange { @@ -6413,7 +6413,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref EnumValueDescriptorProto_default: EnumValueDescriptorProto = EnumValueDescriptorProto::default(); } impl ::pb_jelly::Message for EnumValueDescriptorProto { @@ -6603,7 +6603,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref ServiceDescriptorProto_default: ServiceDescriptorProto = ServiceDescriptorProto::default(); } impl ::pb_jelly::Message for ServiceDescriptorProto { @@ -6836,7 +6836,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref MethodDescriptorProto_default: MethodDescriptorProto = MethodDescriptorProto::default(); } impl ::pb_jelly::Message for MethodDescriptorProto { @@ -7446,7 +7446,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FileOptions_default: FileOptions = FileOptions::default(); } impl ::pb_jelly::Message for FileOptions { @@ -8289,7 +8289,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref MessageOptions_default: MessageOptions = MessageOptions::default(); } impl ::pb_jelly::Message for MessageOptions { @@ -8777,7 +8777,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FieldOptions_default: FieldOptions = FieldOptions::default(); } impl ::pb_jelly::Message for FieldOptions { @@ -9232,7 +9232,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FieldOptions_EditionDefault_default: FieldOptions_EditionDefault = FieldOptions_EditionDefault::default(); } impl ::pb_jelly::Message for FieldOptions_EditionDefault { @@ -9381,7 +9381,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref OneofOptions_default: OneofOptions = OneofOptions::default(); } impl ::pb_jelly::Message for OneofOptions { @@ -9588,7 +9588,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref EnumOptions_default: EnumOptions = EnumOptions::default(); } impl ::pb_jelly::Message for EnumOptions { @@ -9860,7 +9860,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref EnumValueOptions_default: EnumValueOptions = EnumValueOptions::default(); } impl ::pb_jelly::Message for EnumValueOptions { @@ -10096,7 +10096,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref ServiceOptions_default: ServiceOptions = ServiceOptions::default(); } impl ::pb_jelly::Message for ServiceOptions { @@ -10316,7 +10316,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref MethodOptions_default: MethodOptions = MethodOptions::default(); } impl ::pb_jelly::Message for MethodOptions { @@ -10597,7 +10597,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref UninterpretedOption_default: UninterpretedOption = UninterpretedOption::default(); } impl ::pb_jelly::Message for UninterpretedOption { @@ -10888,7 +10888,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref UninterpretedOption_NamePart_default: UninterpretedOption_NamePart = UninterpretedOption_NamePart::default(); } impl ::pb_jelly::Message for UninterpretedOption_NamePart { @@ -11082,7 +11082,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FeatureSet_default: FeatureSet = FeatureSet::default(); } impl ::pb_jelly::Message for FeatureSet { @@ -11358,7 +11358,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FeatureSetDefaults_default: FeatureSetDefaults = FeatureSetDefaults::default(); } impl ::pb_jelly::Message for FeatureSetDefaults { @@ -11531,7 +11531,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref FeatureSetDefaults_FeatureSetEditionDefault_default: FeatureSetDefaults_FeatureSetEditionDefault = FeatureSetDefaults_FeatureSetEditionDefault::default(); } impl ::pb_jelly::Message for FeatureSetDefaults_FeatureSetEditionDefault { @@ -11710,7 +11710,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref SourceCodeInfo_default: SourceCodeInfo = SourceCodeInfo::default(); } impl ::pb_jelly::Message for SourceCodeInfo { @@ -11945,7 +11945,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref SourceCodeInfo_Location_default: SourceCodeInfo_Location = SourceCodeInfo_Location::default(); } impl ::pb_jelly::Message for SourceCodeInfo_Location { @@ -12186,7 +12186,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref GeneratedCodeInfo_default: GeneratedCodeInfo = GeneratedCodeInfo::default(); } impl ::pb_jelly::Message for GeneratedCodeInfo { @@ -12345,7 +12345,7 @@ pub mod google { } } } - lazy_static! { + ::lazy_static::lazy_static! { pub static ref GeneratedCodeInfo_Annotation_default: GeneratedCodeInfo_Annotation = GeneratedCodeInfo_Annotation::default(); } impl ::pb_jelly::Message for GeneratedCodeInfo_Annotation { diff --git a/pb-test/gen/pb-jelly/proto_google/src/lib.rs.expected b/pb-test/gen/pb-jelly/proto_google/src/lib.rs.expected index 6f7d2b9..5887b42 100644 --- a/pb-test/gen/pb-jelly/proto_google/src/lib.rs.expected +++ b/pb-test/gen/pb-jelly/proto_google/src/lib.rs.expected @@ -20,7 +20,5 @@ // TODO: Ideally we don't allow this #![allow(clippy::match_single_binding)] -#[macro_use] -extern crate lazy_static; pub mod protobuf; diff --git a/pb-test/gen/pb-jelly/proto_google/src/protobuf/empty.rs.expected b/pb-test/gen/pb-jelly/proto_google/src/protobuf/empty.rs.expected index bb979c8..aebe2ac 100644 --- a/pb-test/gen/pb-jelly/proto_google/src/protobuf/empty.rs.expected +++ b/pb-test/gen/pb-jelly/proto_google/src/protobuf/empty.rs.expected @@ -17,7 +17,7 @@ impl ::std::default::Default for Empty { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Empty_default: Empty = Empty::default(); } impl ::pb_jelly::Message for Empty { diff --git a/pb-test/gen/pb-jelly/proto_nopackage/src/lib.rs.expected b/pb-test/gen/pb-jelly/proto_nopackage/src/lib.rs.expected index 4f9b8a1..4f2a916 100644 --- a/pb-test/gen/pb-jelly/proto_nopackage/src/lib.rs.expected +++ b/pb-test/gen/pb-jelly/proto_nopackage/src/lib.rs.expected @@ -20,7 +20,5 @@ // TODO: Ideally we don't allow this #![allow(clippy::match_single_binding)] -#[macro_use] -extern crate lazy_static; pub mod proto_nopackage; diff --git a/pb-test/gen/pb-jelly/proto_nopackage/src/proto_nopackage.rs.expected b/pb-test/gen/pb-jelly/proto_nopackage/src/proto_nopackage.rs.expected index f6ea511..a5c6403 100644 --- a/pb-test/gen/pb-jelly/proto_nopackage/src/proto_nopackage.rs.expected +++ b/pb-test/gen/pb-jelly/proto_nopackage/src/proto_nopackage.rs.expected @@ -10,7 +10,7 @@ impl ::std::default::Default for NoPackage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref NoPackage_default: NoPackage = NoPackage::default(); } impl ::pb_jelly::Message for NoPackage { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/bench.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/bench.rs.expected index 3d870f8..1b006a2 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/bench.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/bench.rs.expected @@ -22,7 +22,7 @@ impl ::std::default::Default for BytesData { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref BytesData_default: BytesData = BytesData::default(); } impl ::pb_jelly::Message for BytesData { @@ -134,7 +134,7 @@ impl ::std::default::Default for VecData { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref VecData_default: VecData = VecData::default(); } impl ::pb_jelly::Message for VecData { @@ -238,7 +238,7 @@ impl ::std::default::Default for StringMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref StringMessage_default: StringMessage = StringMessage::default(); } impl ::pb_jelly::Message for StringMessage { @@ -342,7 +342,7 @@ impl ::std::default::Default for StringMessageSSO { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref StringMessageSSO_default: StringMessageSSO = StringMessageSSO::default(); } impl ::pb_jelly::Message for StringMessageSSO { @@ -446,7 +446,7 @@ impl ::std::default::Default for Cities { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Cities_default: Cities = Cities::default(); } impl ::pb_jelly::Message for Cities { @@ -628,7 +628,7 @@ impl ::std::default::Default for City { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref City_default: City = City::default(); } impl ::pb_jelly::Message for City { @@ -906,7 +906,7 @@ impl ::std::default::Default for CitiesSSO { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref CitiesSSO_default: CitiesSSO = CitiesSSO::default(); } impl ::pb_jelly::Message for CitiesSSO { @@ -1088,7 +1088,7 @@ impl ::std::default::Default for CitySSO { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref CitySSO_default: CitySSO = CitySSO::default(); } impl ::pb_jelly::Message for CitySSO { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/extensions.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/extensions.rs.expected index 62dbd38..1424801 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/extensions.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/extensions.rs.expected @@ -23,7 +23,7 @@ impl ::std::default::Default for Msg { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Msg_default: Msg = Msg::default(); } impl ::pb_jelly::Message for Msg { @@ -184,7 +184,7 @@ impl ::std::default::Default for FakeMsg { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref FakeMsg_default: FakeMsg = FakeMsg::default(); } impl ::pb_jelly::Message for FakeMsg { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/lib.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/lib.rs.expected index 315a1d7..f5cda0a 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/lib.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/lib.rs.expected @@ -20,8 +20,6 @@ // TODO: Ideally we don't allow this #![allow(clippy::match_single_binding)] -#[macro_use] -extern crate lazy_static; pub mod bench; pub mod extensions; diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/mod/struct.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/mod/struct.rs.expected index f14a6b3..066a65f 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/mod/struct.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/mod/struct.rs.expected @@ -8,7 +8,7 @@ impl ::std::default::Default for Message { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Message_default: Message = Message::default(); } impl ::pb_jelly::Message for Message { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest2.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest2.rs.expected index 4c29add..3267545 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest2.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest2.rs.expected @@ -401,7 +401,7 @@ impl ::std::default::Default for Option { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Option_default: Option = Option::default(); } impl ::pb_jelly::Message for Option { @@ -460,7 +460,7 @@ impl ::std::default::Default for Vec { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Vec_default: Vec = Vec::default(); } impl ::pb_jelly::Message for Vec { @@ -519,7 +519,7 @@ impl ::std::default::Default for Default { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Default_default: Default = Default::default(); } impl ::pb_jelly::Message for Default { @@ -578,7 +578,7 @@ impl ::std::default::Default for String { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref String_default: String = String::default(); } impl ::pb_jelly::Message for String { @@ -643,7 +643,7 @@ impl ::std::default::Default for Version0OneOfNoneNullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version0OneOfNoneNullable_default: Version0OneOfNoneNullable = Version0OneOfNoneNullable::default(); } impl ::pb_jelly::Message for Version0OneOfNoneNullable { @@ -757,7 +757,7 @@ impl ::std::default::Default for Version1OneOfNoneNullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version1OneOfNoneNullable_default: Version1OneOfNoneNullable = Version1OneOfNoneNullable::default(); } impl ::pb_jelly::Message for Version1OneOfNoneNullable { @@ -920,7 +920,7 @@ impl ::std::default::Default for Version2OneOfNoneNullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version2OneOfNoneNullable_default: Version2OneOfNoneNullable = Version2OneOfNoneNullable::default(); } impl ::pb_jelly::Message for Version2OneOfNoneNullable { @@ -1125,7 +1125,7 @@ impl ::std::default::Default for Version1Enum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version1Enum_default: Version1Enum = Version1Enum::default(); } impl ::pb_jelly::Message for Version1Enum { @@ -1223,7 +1223,7 @@ impl ::std::default::Default for Version2Enum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version2Enum_default: Version2Enum = Version2Enum::default(); } impl ::pb_jelly::Message for Version2Enum { @@ -1316,7 +1316,7 @@ impl ::std::default::Default for Version1OneOf { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version1OneOf_default: Version1OneOf = Version1OneOf::default(); } impl ::pb_jelly::Message for Version1OneOf { @@ -1431,7 +1431,7 @@ impl ::std::default::Default for Version2OneOf { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version2OneOf_default: Version2OneOf = Version2OneOf::default(); } impl ::pb_jelly::Message for Version2OneOf { @@ -1592,7 +1592,7 @@ impl ::std::default::Default for Version1 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version1_default: Version1 = Version1::default(); } impl ::pb_jelly::Message for Version1 { @@ -1845,7 +1845,7 @@ impl ::std::default::Default for Version2 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version2_default: Version2 = Version2::default(); } impl ::pb_jelly::Message for Version2 { @@ -2303,7 +2303,7 @@ impl ::std::default::Default for ForeignMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref ForeignMessage_default: ForeignMessage = ForeignMessage::default(); } impl ::pb_jelly::Message for ForeignMessage { @@ -2884,7 +2884,7 @@ impl ::std::default::Default for TestMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage_default: TestMessage = TestMessage::default(); } impl ::pb_jelly::Message for TestMessage { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest3.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest3.rs.expected index 3fec46d..93817e2 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest3.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/pbtest3.rs.expected @@ -695,7 +695,7 @@ impl ::std::default::Default for ForeignMessage3 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref ForeignMessage3_default: ForeignMessage3 = ForeignMessage3::default(); } impl ::pb_jelly::Message for ForeignMessage3 { @@ -778,7 +778,7 @@ impl ::std::default::Default for Version31OneOfNoneNullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version31OneOfNoneNullable_default: Version31OneOfNoneNullable = Version31OneOfNoneNullable::default(); } impl ::pb_jelly::Message for Version31OneOfNoneNullable { @@ -939,7 +939,7 @@ impl ::std::default::Default for Version32OneOfNoneNullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version32OneOfNoneNullable_default: Version32OneOfNoneNullable = Version32OneOfNoneNullable::default(); } impl ::pb_jelly::Message for Version32OneOfNoneNullable { @@ -1133,7 +1133,7 @@ impl ::std::default::Default for Version31Enum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version31Enum_default: Version31Enum = Version31Enum::default(); } impl ::pb_jelly::Message for Version31Enum { @@ -1211,7 +1211,7 @@ impl ::std::default::Default for Version32Enum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version32Enum_default: Version32Enum = Version32Enum::default(); } impl ::pb_jelly::Message for Version32Enum { @@ -1293,7 +1293,7 @@ impl ::std::default::Default for Version31OneOf { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version31OneOf_default: Version31OneOf = Version31OneOf::default(); } impl ::pb_jelly::Message for Version31OneOf { @@ -1406,7 +1406,7 @@ impl ::std::default::Default for Version32OneOf { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version32OneOf_default: Version32OneOf = Version32OneOf::default(); } impl ::pb_jelly::Message for Version32OneOf { @@ -1553,7 +1553,7 @@ impl ::std::default::Default for Version31 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version31_default: Version31 = Version31::default(); } impl ::pb_jelly::Message for Version31 { @@ -1631,7 +1631,7 @@ impl ::std::default::Default for Version31SSO { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version31SSO_default: Version31SSO = Version31SSO::default(); } impl ::pb_jelly::Message for Version31SSO { @@ -1735,7 +1735,7 @@ impl ::std::default::Default for Version32 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref Version32_default: Version32 = Version32::default(); } impl ::pb_jelly::Message for Version32 { @@ -2185,7 +2185,7 @@ impl ::std::default::Default for TestMessage3 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3_default: TestMessage3 = TestMessage3::default(); } impl ::pb_jelly::Message for TestMessage3 { @@ -4123,7 +4123,7 @@ impl ::std::default::Default for TestMessage3_NestedMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3_NestedMessage_default: TestMessage3_NestedMessage = TestMessage3_NestedMessage::default(); } impl ::pb_jelly::Message for TestMessage3_NestedMessage { @@ -4358,7 +4358,7 @@ impl ::std::default::Default for TestMessage3_NestedMessage_File { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3_NestedMessage_File_default: TestMessage3_NestedMessage_File = TestMessage3_NestedMessage_File::default(); } impl ::pb_jelly::Message for TestMessage3_NestedMessage_File { @@ -4464,7 +4464,7 @@ impl ::std::default::Default for TestMessage3_NestedMessage_Dir { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3_NestedMessage_Dir_default: TestMessage3_NestedMessage_Dir = TestMessage3_NestedMessage_Dir::default(); } impl ::pb_jelly::Message for TestMessage3_NestedMessage_Dir { @@ -4523,7 +4523,7 @@ impl ::std::default::Default for TestBoxedNonnullable { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestBoxedNonnullable_default: TestBoxedNonnullable = TestBoxedNonnullable::default(); } impl ::pb_jelly::Message for TestBoxedNonnullable { @@ -4622,7 +4622,7 @@ impl ::std::default::Default for TestMessage3NonNullableOneof { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3NonNullableOneof_default: TestMessage3NonNullableOneof = TestMessage3NonNullableOneof::default(); } impl ::pb_jelly::Message for TestMessage3NonNullableOneof { @@ -4789,7 +4789,7 @@ impl ::std::default::Default for TestMessage3ErrIfDefaultEnum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3ErrIfDefaultEnum_default: TestMessage3ErrIfDefaultEnum = TestMessage3ErrIfDefaultEnum::default(); } impl ::pb_jelly::Message for TestMessage3ErrIfDefaultEnum { @@ -4885,7 +4885,7 @@ impl ::std::default::Default for TestMessage3ErrIfDefaultEnumOneof { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3ErrIfDefaultEnumOneof_default: TestMessage3ErrIfDefaultEnumOneof = TestMessage3ErrIfDefaultEnumOneof::default(); } impl ::pb_jelly::Message for TestMessage3ErrIfDefaultEnumOneof { @@ -5020,7 +5020,7 @@ impl ::std::default::Default for TestMessage3RepeatedErrIfDefaultEnum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3RepeatedErrIfDefaultEnum_default: TestMessage3RepeatedErrIfDefaultEnum = TestMessage3RepeatedErrIfDefaultEnum::default(); } impl ::pb_jelly::Message for TestMessage3RepeatedErrIfDefaultEnum { @@ -5116,7 +5116,7 @@ impl ::std::default::Default for TestMessage3ClosedEnum { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3ClosedEnum_default: TestMessage3ClosedEnum = TestMessage3ClosedEnum::default(); } impl ::pb_jelly::Message for TestMessage3ClosedEnum { @@ -5194,7 +5194,7 @@ impl ::std::default::Default for TestMessage3ClosedEnum2 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3ClosedEnum2_default: TestMessage3ClosedEnum2 = TestMessage3ClosedEnum2::default(); } impl ::pb_jelly::Message for TestMessage3ClosedEnum2 { @@ -5272,7 +5272,7 @@ impl ::std::default::Default for TestMessage3NonOptionalBoxedMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3NonOptionalBoxedMessage_default: TestMessage3NonOptionalBoxedMessage = TestMessage3NonOptionalBoxedMessage::default(); } impl ::pb_jelly::Message for TestMessage3NonOptionalBoxedMessage { @@ -5364,7 +5364,7 @@ impl ::std::default::Default for TestMessage3NonOptionalBoxedMessage_InnerMessag } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestMessage3NonOptionalBoxedMessage_InnerMessage_default: TestMessage3NonOptionalBoxedMessage_InnerMessage = TestMessage3NonOptionalBoxedMessage_InnerMessage::default(); } impl ::pb_jelly::Message for TestMessage3NonOptionalBoxedMessage_InnerMessage { @@ -5444,7 +5444,7 @@ impl ::std::default::Default for TestPreserveUnrecognized1 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestPreserveUnrecognized1_default: TestPreserveUnrecognized1 = TestPreserveUnrecognized1::default(); } impl ::pb_jelly::Message for TestPreserveUnrecognized1 { @@ -5555,7 +5555,7 @@ impl ::std::default::Default for TestPreserveUnrecognized2 { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestPreserveUnrecognized2_default: TestPreserveUnrecognized2 = TestPreserveUnrecognized2::default(); } impl ::pb_jelly::Message for TestPreserveUnrecognized2 { @@ -5872,7 +5872,7 @@ impl ::std::default::Default for TestPreserveUnrecognizedEmpty { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestPreserveUnrecognizedEmpty_default: TestPreserveUnrecognizedEmpty = TestPreserveUnrecognizedEmpty::default(); } impl ::pb_jelly::Message for TestPreserveUnrecognizedEmpty { @@ -5937,7 +5937,7 @@ impl ::std::default::Default for TestSmallString { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestSmallString_default: TestSmallString = TestSmallString::default(); } impl ::pb_jelly::Message for TestSmallString { @@ -6015,7 +6015,7 @@ impl ::std::default::Default for TestBoxedSmallString { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestBoxedSmallString_default: TestBoxedSmallString = TestBoxedSmallString::default(); } impl ::pb_jelly::Message for TestBoxedSmallString { @@ -6093,7 +6093,7 @@ impl ::std::default::Default for TestNonOptionalSmallString { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestNonOptionalSmallString_default: TestNonOptionalSmallString = TestNonOptionalSmallString::default(); } impl ::pb_jelly::Message for TestNonOptionalSmallString { @@ -6173,7 +6173,7 @@ impl ::std::default::Default for TestSmallStringPreserveUnrecognized { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestSmallStringPreserveUnrecognized_default: TestSmallStringPreserveUnrecognized = TestSmallStringPreserveUnrecognized::default(); } impl ::pb_jelly::Message for TestSmallStringPreserveUnrecognized { @@ -6297,7 +6297,7 @@ impl ::std::default::Default for TestProto3Optional { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestProto3Optional_default: TestProto3Optional = TestProto3Optional::default(); } impl ::pb_jelly::Message for TestProto3Optional { @@ -6931,7 +6931,7 @@ impl ::std::default::Default for TestProto3Zerocopy { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestProto3Zerocopy_default: TestProto3Zerocopy = TestProto3Zerocopy::default(); } impl ::pb_jelly::Message for TestProto3Zerocopy { @@ -7039,7 +7039,7 @@ impl ::std::default::Default for TestProto3ContainsZerocopy { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref TestProto3ContainsZerocopy_default: TestProto3ContainsZerocopy = TestProto3ContainsZerocopy::default(); } impl ::pb_jelly::Message for TestProto3ContainsZerocopy { @@ -7146,7 +7146,7 @@ impl ::std::default::Default for RecursiveOneof { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref RecursiveOneof_default: RecursiveOneof = RecursiveOneof::default(); } impl ::pb_jelly::Message for RecursiveOneof { @@ -7434,7 +7434,7 @@ impl ::std::default::Default for MentionsKeywordPath { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MentionsKeywordPath_default: MentionsKeywordPath = MentionsKeywordPath::default(); } impl ::pb_jelly::Message for MentionsKeywordPath { @@ -7528,7 +7528,7 @@ impl ::std::default::Default for NonNullableOneofKeyword { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref NonNullableOneofKeyword_default: NonNullableOneofKeyword = NonNullableOneofKeyword::default(); } impl ::pb_jelly::Message for NonNullableOneofKeyword { @@ -7632,7 +7632,7 @@ impl ::std::default::Default for NonNullableEnumKeyword { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref NonNullableEnumKeyword_default: NonNullableEnumKeyword = NonNullableEnumKeyword::default(); } impl ::pb_jelly::Message for NonNullableEnumKeyword { @@ -7722,7 +7722,7 @@ impl ::std::default::Default for MutuallyRecursiveA { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveA_default: MutuallyRecursiveA = MutuallyRecursiveA::default(); } impl ::pb_jelly::Message for MutuallyRecursiveA { @@ -7814,7 +7814,7 @@ impl ::std::default::Default for MutuallyRecursiveB { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveB_default: MutuallyRecursiveB = MutuallyRecursiveB::default(); } impl ::pb_jelly::Message for MutuallyRecursiveB { @@ -7906,7 +7906,7 @@ impl ::std::default::Default for MutuallyRecursiveWithRepeatedA { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveWithRepeatedA_default: MutuallyRecursiveWithRepeatedA = MutuallyRecursiveWithRepeatedA::default(); } impl ::pb_jelly::Message for MutuallyRecursiveWithRepeatedA { @@ -7998,7 +7998,7 @@ impl ::std::default::Default for MutuallyRecursiveWithRepeatedB { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveWithRepeatedB_default: MutuallyRecursiveWithRepeatedB = MutuallyRecursiveWithRepeatedB::default(); } impl ::pb_jelly::Message for MutuallyRecursiveWithRepeatedB { @@ -8088,7 +8088,7 @@ impl ::std::default::Default for MutuallyRecursiveWithBoxedA { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveWithBoxedA_default: MutuallyRecursiveWithBoxedA = MutuallyRecursiveWithBoxedA::default(); } impl ::pb_jelly::Message for MutuallyRecursiveWithBoxedA { @@ -8181,7 +8181,7 @@ impl ::std::default::Default for MutuallyRecursiveWithBoxedB { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref MutuallyRecursiveWithBoxedB_default: MutuallyRecursiveWithBoxedB = MutuallyRecursiveWithBoxedB::default(); } impl ::pb_jelly::Message for MutuallyRecursiveWithBoxedB { diff --git a/pb-test/gen/pb-jelly/proto_pbtest/src/servicepb.rs.expected b/pb-test/gen/pb-jelly/proto_pbtest/src/servicepb.rs.expected index 100f234..18ef4da 100644 --- a/pb-test/gen/pb-jelly/proto_pbtest/src/servicepb.rs.expected +++ b/pb-test/gen/pb-jelly/proto_pbtest/src/servicepb.rs.expected @@ -10,7 +10,7 @@ impl ::std::default::Default for InpMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref InpMessage_default: InpMessage = InpMessage::default(); } impl ::pb_jelly::Message for InpMessage { @@ -88,7 +88,7 @@ impl ::std::default::Default for OutMessage { } } } -lazy_static! { +::lazy_static::lazy_static! { pub static ref OutMessage_default: OutMessage = OutMessage::default(); } impl ::pb_jelly::Message for OutMessage {