Merge pull request #66 from whisperfish/once-cell

Once cell instead of lazy_static

Author: gferon

Cargo.toml

@@ -17,7 +17,7 @@ bincode = "1.3"
 either = "1.11"
 fnv = "1"
 itertools = ">=0.10, <= 0.12"
-lazy_static = "1.4"
+once_cell = "1"
 nom = "7.1"
 quick-xml = ">=0.28, <= 0.31"
 regex = "1.7"

clippy.toml

@@ -41,7 +41,7 @@ impl AsRef<str> for Carrier {
 }
 
 impl fmt::Display for Carrier {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.0)
     }
 }

src/carrier.rs

@@ -328,4 +328,4 @@ pub enum Id {
     ZW,
 }
 
-pub use self::Id::*;
+pub use Id::*;

src/consts.rs

@@ -41,7 +41,7 @@ impl AsRef<str> for Extension {
 }
 
 impl fmt::Display for Extension {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.0)
     }
 }

src/country.rs

@@ -98,7 +98,7 @@ pub fn format_with<'d, 'n>(
 }
 
 impl<'n, 'd, 'f> fmt::Display for Formatter<'n, 'd, 'f> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let db = self.database.unwrap_or(&DATABASE);
 
         // If the country code is invalid, return an error.
@@ -247,9 +247,9 @@ fn replace(
                     .get(1)
                     .unwrap()
                     .as_str();
-                let format = transform.replace(*consts::NP, meta.national_prefix().unwrap_or(""));
-                let format = format.replace(*consts::FG, &format!("${}", first));
-                let format = format.replace(*consts::CC, carrier.unwrap_or(""));
+                let format = transform.replace(consts::NP, meta.national_prefix().unwrap_or(""));
+                let format = format.replace(consts::FG, &format!("${}", first));
+                let format = format.replace(consts::CC, carrier.unwrap_or(""));
 
                 consts::FIRST_GROUP.replace(formatter.format(), &*format)
             } else {

src/extension.rs

@@ -12,29 +12,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::error;
+use crate::metadata::loader;
+use crate::Metadata;
+use bincode;
+use bincode::Options;
+use fnv::FnvHashMap;
+use once_cell::sync::Lazy;
+use regex_cache::{CachedRegex, CachedRegexBuilder, RegexCache};
 use std::borrow::Borrow;
 use std::fs::File;
 use std::hash::Hash;
 use std::io::{BufReader, Cursor};
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use bincode::Options;
-use fnv::FnvHashMap;
-use regex_cache::{CachedRegex, CachedRegexBuilder, RegexCache};
-
-use crate::error;
-use crate::metadata::loader;
-use crate::Metadata;
-
 const DATABASE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/database.bin"));
 
-lazy_static::lazy_static! {
-    /// The Google provided metadata database, used as default.
-    pub static ref DEFAULT: Database =
-        Database::from(bincode::options()
-        .with_varint_encoding().deserialize(DATABASE).unwrap()).unwrap();
-}
+/// The Google provided metadata database, used as default.
+pub static DEFAULT: Lazy<Database> = Lazy::new(|| {
+    Database::from(
+        bincode::options()
+            .with_varint_encoding()
+            .deserialize(DATABASE)
+            .unwrap(),
+    )
+    .unwrap()
+});
 
 /// Representation of a database of metadata for phone number.
 #[derive(Clone, Debug)]

src/formatter.rs

@@ -67,7 +67,7 @@ impl From<NationalNumber> for u64 {
 }
 
 impl fmt::Display for NationalNumber {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for _ in 0..self.zeros() {
             write!(f, "0")?;
         }

src/metadata/database.rs

@@ -12,24 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::consts;
+use crate::country;
+use crate::error;
+use crate::metadata::{Database, Metadata};
+use crate::phone_number::Type;
+use crate::validator;
+use fnv::FnvHashMap;
 use nom::{
     character::complete::*,
     combinator::*,
     error::{make_error, ErrorKind},
     multi::*,
     AsChar, IResult,
 };
-use std::borrow::Cow;
-
-use fnv::FnvHashMap;
 use regex_cache::CachedRegex;
-
-use crate::consts;
-use crate::country;
-use crate::error;
-use crate::metadata::{Database, Metadata};
-use crate::phone_number::Type;
-use crate::validator;
+use std::borrow::Cow;
 
 macro_rules! parse {
 	($input:ident => ) => ();
@@ -369,7 +367,7 @@ pub fn normalize<'a>(mut number: Number<'a>, mappings: &FnvHashMap<char, char>)
     number
 }
 
-pub fn trim(value: Cow<str>, start: usize) -> Cow<str> {
+pub fn trim(value: Cow<'_, str>, start: usize) -> Cow<'_, str> {
     match value {
         Cow::Borrowed(value) => Cow::Borrowed(&value[start..]),