Update generated location

src/generated/metadata/mod.rs

@@ -0,0 +1,6 @@
+mod metadata;
+mod test_metadata;
+
+pub use metadata::METADATA;
+pub use test_metadata::TEST_METADATA;
+

src/generated/mod.rs

@@ -0,0 +1,2 @@
+pub mod proto;
+pub mod metadata;

src/interfaces/mod.rs

@@ -1,5 +1,5 @@
 
-use crate::proto_gen::phonemetadata::PhoneNumberDesc;
+use crate::phonemetadata::PhoneNumberDesc;
 /// Internal phonenumber matching API used to isolate the underlying
 /// implementation of the matcher and allow different implementations to be
 /// swapped in easily.

src/lib.rs

@@ -1,7 +1,7 @@
 mod shortnumberinfo;
 mod interfaces;
 /// This module is automatically generated from /resources/*.proto
-mod proto_gen;
+mod generated;
 mod phonenumberutil;
 mod regexp_cache;
 mod regex_based_matcher;
@@ -30,6 +30,6 @@ pub use phonenumberutil::{
     errors,
     enums,
 };
-pub use proto_gen::phonemetadata;
+pub use generated::proto::phonemetadata;
-pub use proto_gen::phonenumber;
+pub use generated::proto::phonenumber;
 mod tests;

src/phonenumberutil/generated/mod.rs

@@ -1,3 +0,0 @@
-pub mod metadata;
-pub mod test_metadata;
-

src/phonenumberutil/helper_functions.rs

@@ -4,10 +4,10 @@ use protobuf::Message;
 use strum::IntoEnumIterator;
 
 use crate::{
-    interfaces::MatcherApi, phonenumberutil::generated::metadata::METADATA, proto_gen::{
+    interfaces::MatcherApi, generated::metadata::METADATA, 
         phonemetadata::{PhoneMetadata, PhoneMetadataCollection, PhoneNumberDesc},
         phonenumber::PhoneNumber,
-    }
+    
 };
 
 use super::{

src/phonenumberutil/helper_types.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::proto_gen::phonenumber::phone_number::CountryCodeSource;
+use crate::phonenumber::phone_number::CountryCodeSource;
 
 #[derive(Debug)]
 pub struct PhoneNumberWithCountryCodeSource<'a> {

src/phonenumberutil/mod.rs

@@ -6,7 +6,6 @@ pub mod phonenumberutil;
 mod phone_number_regexps_and_mappings;
 pub(self) mod helper_types;
 pub(self) mod comparisons;
-pub(crate) mod generated;
 
 use std::sync::LazyLock;
 

src/phonenumberutil/phonenumberutil.rs

@@ -37,10 +37,10 @@ use crate::{
             prefix_number_with_country_calling_code, test_number_length,
             test_number_length_with_unknown_type,
         }, helper_types::{PhoneNumberAndCarrierCode, PhoneNumberWithCountryCodeSource}, MatchType, PhoneNumberFormat, PhoneNumberType, ValidNumberLenType
-    }, proto_gen::{
+    }, 
-        phonemetadata::{NumberFormat, PhoneMetadata, PhoneNumberDesc},
+    phonemetadata::{NumberFormat, PhoneMetadata, PhoneNumberDesc},
-        phonenumber::{phone_number::CountryCodeSource, PhoneNumber},
+    phonenumber::{phone_number::CountryCodeSource, PhoneNumber},
-    }, regex_based_matcher::RegexBasedMatcher, regex_util::{RegexConsume, RegexFullMatch}, regexp_cache::ErrorInvalidRegex, string_util::strip_cow_prefix
+    regex_based_matcher::RegexBasedMatcher, regex_util::{RegexConsume, RegexFullMatch}, regexp_cache::ErrorInvalidRegex, string_util::strip_cow_prefix
 };
 
 use dec_from_char::DecimalExtended;

src/regex_based_matcher.rs

@@ -1,7 +1,7 @@
 use log::{error};
 use super::regex_util::{RegexFullMatch, RegexConsume};
 
-use crate::{interfaces, proto_gen::phonemetadata::PhoneNumberDesc, regexp_cache::{ErrorInvalidRegex, RegexCache}};
+use crate::{interfaces, phonemetadata::PhoneNumberDesc, regexp_cache::{ErrorInvalidRegex, RegexCache}};
 
 pub struct RegexBasedMatcher {
     cache: RegexCache,   

src/tests/tests.rs

@@ -17,7 +17,7 @@ use crate::{
 };
 
 use super::region_code::RegionCode;
-use crate::phonenumberutil::generated::test_metadata::TEST_METADATA;
+use crate::generated::metadata::TEST_METADATA;
 
 fn get_phone_util() -> PhoneNumberUtil {
     let metadata = PhoneMetadataCollection::parse_from_bytes(&TEST_METADATA)

tools/scripts/generate_metadata.sh

@@ -3,7 +3,7 @@
 filedir="./$(dirname "$0")"
 javadir="$filedir/../java"
 project_home="$filedir/../.."
-generated_dir="$project_home/src/phonenumberutil/generated"
+generated_dir="$project_home/src/generated/metadata"
 echo $generated_dir
 
 resources_dir="$project_home/resources"
@@ -28,6 +28,9 @@ generate "PhoneNumberMetadata.xml" "metadata" "metadata" "METADATA"
 generate "PhoneNumberMetadataForTesting.xml" "test_metadata" "metadata" "TEST_METADATA"
 
 echo "\
-pub mod metadata;
+mod metadata;
-pub mod test_metadata;
+mod test_metadata;
+
+pub use metadata::METADATA;
+pub use test_metadata::TEST_METADATA;
 " > "$generated_dir/mod.rs"