Replace lazy_static! with once_cell Lazy (#176)

Modern rust code bases prefer once_cell::sync::Lazy over the older
macro based lazy_static.
This commit is contained in:
Martin Algesten
2020-10-04 18:35:31 +02:00
committed by GitHub
parent b58a3a53b0
commit 0bf981031b
3 changed files with 10 additions and 14 deletions

View File

@@ -327,16 +327,14 @@ fn configure_certs(config: &mut rustls::ClientConfig) {
#[cfg(all(feature = "tls", not(feature = "native-tls")))]
pub(crate) fn connect_https(unit: &Unit, hostname: &str) -> Result<Stream, Error> {
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use std::sync::Arc;
lazy_static! {
static ref TLS_CONF: Arc<rustls::ClientConfig> = {
let mut config = rustls::ClientConfig::new();
configure_certs(&mut config);
Arc::new(config)
};
}
static TLS_CONF: Lazy<Arc<rustls::ClientConfig>> = Lazy::new(|| {
let mut config = rustls::ClientConfig::new();
configure_certs(&mut config);
Arc::new(config)
});
let port = unit.url.port().unwrap_or(443);

View File

@@ -1,7 +1,7 @@
use crate::error::Error;
use crate::stream::Stream;
use crate::unit::Unit;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use std::collections::HashMap;
use std::io::{Cursor, Write};
use std::sync::{Arc, Mutex};
@@ -19,10 +19,8 @@ mod timeout;
type RequestHandler = dyn Fn(&Unit) -> Result<Stream, Error> + Send + 'static;
lazy_static! {
pub(crate) static ref TEST_HANDLERS: Arc<Mutex<HashMap<String, Box<RequestHandler>>>> =
Arc::new(Mutex::new(HashMap::new()));
}
pub(crate) static TEST_HANDLERS: Lazy<Arc<Mutex<HashMap<String, Box<RequestHandler>>>>> =
Lazy::new(|| Arc::new(Mutex::new(HashMap::new())));
pub(crate) fn set_handler<H>(path: &str, handler: H)
where