deps: replace lazy_static with once_cell (#3187)

This commit is contained in:
Iban Eguia
2020-12-04 10:23:13 +01:00
committed by GitHub
parent a125ebd745
commit 0dbba13984
3 changed files with 10 additions and 12 deletions
+3 -4
View File
@@ -50,7 +50,6 @@ io-util = ["memchr", "bytes"]
io-std = []
macros = ["tokio-macros"]
net = [
"lazy_static",
"libc",
"mio/os-poll",
"mio/os-util",
@@ -60,7 +59,7 @@ net = [
]
process = [
"bytes",
"lazy_static",
"once_cell",
"libc",
"mio/os-poll",
"mio/os-util",
@@ -75,7 +74,7 @@ rt-multi-thread = [
"rt",
]
signal = [
"lazy_static",
"once_cell",
"libc",
"mio/os-poll",
"mio/uds",
@@ -96,7 +95,7 @@ pin-project-lite = "0.2.0"
# Everything else is optional...
bytes = { version = "0.6.0", optional = true }
futures-core = { version = "0.3.0", optional = true }
lazy_static = { version = "1.4.0", optional = true }
once_cell = { version = "1.5.2", optional = true }
memchr = { version = "2.2", optional = true }
mio = { version = "0.7.6", optional = true }
num_cpus = { version = "1.8.0", optional = true }
+2 -3
View File
@@ -36,6 +36,7 @@ use crate::signal::unix::{signal, Signal, SignalKind};
use mio::event::Source;
use mio::unix::SourceFd;
use once_cell::sync::Lazy;
use std::fmt;
use std::fs::File;
use std::future::Future;
@@ -62,9 +63,7 @@ impl Kill for StdChild {
}
}
lazy_static::lazy_static! {
static ref ORPHAN_QUEUE: OrphanQueueImpl<StdChild> = OrphanQueueImpl::new();
}
static ORPHAN_QUEUE: Lazy<OrphanQueueImpl<StdChild>> = Lazy::new(OrphanQueueImpl::new);
pub(crate) struct GlobalOrphanQueue;
+5 -5
View File
@@ -4,7 +4,7 @@ use crate::signal::os::{OsExtraData, OsStorage};
use crate::sync::mpsc::Sender;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use std::ops;
use std::pin::Pin;
use std::sync::atomic::{AtomicBool, Ordering};
@@ -165,12 +165,12 @@ where
OsExtraData: 'static + Send + Sync + Init,
OsStorage: 'static + Send + Sync + Init,
{
lazy_static! {
static ref GLOBALS: Pin<Box<Globals>> = Box::pin(Globals {
static GLOBALS: Lazy<Pin<Box<Globals>>> = Lazy::new(|| {
Box::pin(Globals {
extra: OsExtraData::init(),
registry: Registry::new(OsStorage::init()),
});
}
})
});
GLOBALS.as_ref()
}