Switch from lazy_static to once_cell

This also changes the MSRV from 1.34.0 to 1.36.0.
baloo · Dec 30, 2020 · 0e4aec0 · 0e4aec0
1 parent 7225dbb
commit 0e4aec0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
         default: false
       image:
         type: string
-        default: 1.34.0
+        default: 1.36.0
       minimal_build:
         type: boolean
         default: false
@@ -175,7 +175,7 @@ jobs:
         default: false
       image:
         type: string
-        default: 1.34.0
+        default: 1.36.0
     macos:
       xcode: "12.2.0"
     environment:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust
-        run: rustup update --no-self-update 1.34.0 && rustup default 1.34.0
+        run: rustup update --no-self-update 1.36.0 && rustup default 1.36.0
       - name: Get rust version
         id: rust-version
         run: echo "::set-output name=version::$(rustc --version)"

diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
@@ -22,8 +22,8 @@ vendored = ['openssl-sys/vendored']
 bitflags = "1.0"
 cfg-if = "1.0"
 foreign-types = "0.3.1"
-lazy_static = "1"
 libc = "0.2"
+once_cell = "1.5.2"
 
 openssl-sys = { version = "0.9.60", path = "../openssl-sys" }
 

diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
@@ -116,9 +116,8 @@ extern crate bitflags;
 extern crate cfg_if;
 #[macro_use]
 extern crate foreign_types;
-#[macro_use]
-extern crate lazy_static;
 extern crate libc;
+extern crate once_cell;
 extern crate openssl_sys as ffi;
 
 #[cfg(test)]

diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs
@@ -414,10 +414,10 @@ cfg_if! {
                 GeneralName, X509NameRef, X509Ref, X509StoreContext, X509StoreContextRef,
                 X509VerifyResult,
             };
+            use once_cell::sync::Lazy;
 
-            lazy_static! {
-                pub static ref HOSTNAME_IDX: Index<Ssl, String> = Ssl::new_ex_index().unwrap();
-            }
+            pub static HOSTNAME_IDX: Lazy<Index<Ssl, String>> =
+                Lazy::new(|| Ssl::new_ex_index().unwrap());
 
             pub fn verify_callback(preverify_ok: bool, x509_ctx: &mut X509StoreContextRef) -> bool {
                 if !preverify_ok || x509_ctx.error_depth() != 0 {

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
@@ -87,6 +87,7 @@ use ex_data::Index;
 use hash::MessageDigest;
 #[cfg(ossl110)]
 use nid::Nid;
+use once_cell::sync::Lazy;
 use pkey::{HasPrivate, PKeyRef, Params, Private};
 use srtp::{SrtpProtectionProfile, SrtpProtectionProfileRef};
 use ssl::bio::BioMethod;
@@ -512,11 +513,9 @@ impl NameType {
     }
 }
 
-lazy_static! {
-    static ref INDEXES: Mutex<HashMap<TypeId, c_int>> = Mutex::new(HashMap::new());
-    static ref SSL_INDEXES: Mutex<HashMap<TypeId, c_int>> = Mutex::new(HashMap::new());
-    static ref SESSION_CTX_INDEX: Index<Ssl, SslContext> = Ssl::new_ex_index().unwrap();
-}
+static INDEXES: Lazy<Mutex<HashMap<TypeId, c_int>>> = Lazy::new(|| Mutex::new(HashMap::new()));
+static SSL_INDEXES: Lazy<Mutex<HashMap<TypeId, c_int>>> = Lazy::new(|| Mutex::new(HashMap::new()));
+static SESSION_CTX_INDEX: Lazy<Index<Ssl, SslContext>> = Lazy::new(|| Ssl::new_ex_index().unwrap());
 
 unsafe extern "C" fn free_data_box<T>(
     _parent: *mut c_void,