Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate lazy_static to once_cell #1565

Merged
merged 2 commits into from Jul 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -98,7 +98,7 @@ futures-util = { version = "0.3.0", default-features = false }
http-body = "0.4.0"
hyper = { version = "0.14.18", default-features = false, features = ["tcp", "http1", "http2", "client", "runtime"] }
h2 = "0.3.10"
lazy_static = "1.4"
once_cell = "1"
log = "0.4"
mime = "0.3.16"
percent-encoding = "2.1"
Expand Down
7 changes: 3 additions & 4 deletions src/dns.rs
Expand Up @@ -7,6 +7,7 @@ use std::task::{self, Poll};

use hyper::client::connect::dns as hyper_dns;
use hyper::service::Service;
use once_cell::sync::Lazy;
use tokio::sync::Mutex;
use trust_dns_resolver::{
config::{ResolverConfig, ResolverOpts},
Expand All @@ -18,10 +19,8 @@ use crate::error::BoxError;

type SharedResolver = Arc<AsyncResolver<TokioConnection, TokioConnectionProvider>>;

lazy_static! {
static ref SYSTEM_CONF: io::Result<(ResolverConfig, ResolverOpts)> =
system_conf::read_system_conf().map_err(io::Error::from);
}
static SYSTEM_CONF: Lazy<io::Result<(ResolverConfig, ResolverOpts)>> =
Lazy::new(|| system_conf::read_system_conf().map_err(io::Error::from));

#[derive(Clone)]
pub(crate) struct TrustDnsResolver {
Expand Down
3 changes: 0 additions & 3 deletions src/lib.rs
Expand Up @@ -289,9 +289,6 @@ if_hyper! {
#[macro_use]
extern crate doc_comment;

#[macro_use]
extern crate lazy_static;

#[cfg(test)]
doctest!("../README.md");

Expand Down
12 changes: 5 additions & 7 deletions src/proxy.rs
Expand Up @@ -7,6 +7,7 @@ use crate::into_url::{IntoUrl, IntoUrlSealed};
use crate::Url;
use http::{header::HeaderValue, Uri};
use ipnet::IpNet;
use once_cell::sync::Lazy;
use percent_encoding::percent_decode;
use std::collections::HashMap;
use std::env;
Expand Down Expand Up @@ -755,9 +756,8 @@ impl Dst for Uri {
}
}

lazy_static! {
static ref SYS_PROXIES: Arc<SystemProxyMap> = Arc::new(get_sys_proxies(get_from_registry()));
}
static SYS_PROXIES: Lazy<Arc<SystemProxyMap>> =
Lazy::new(|| Arc::new(get_sys_proxies(get_from_registry())));

/// Get system proxies information.
///
Expand Down Expand Up @@ -934,7 +934,7 @@ fn parse_registry_values(registry_values: RegistryProxyValues) -> SystemProxyMap
#[cfg(test)]
mod tests {
use super::*;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use std::sync::Mutex;

impl Dst for Url {
Expand Down Expand Up @@ -1074,9 +1074,7 @@ mod tests {
// Smallest possible content for a mutex
struct MutexInner;

lazy_static! {
static ref ENVLOCK: Mutex<MutexInner> = Mutex::new(MutexInner);
}
static ENVLOCK: Lazy<Mutex<MutexInner>> = Lazy::new(|| Mutex::new(MutexInner));

#[test]
fn test_get_sys_proxies_parsing() {
Expand Down