diff options
author | Linus Färnstrand <faern@faern.net> | 2020-01-06 19:04:21 +0100 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2020-01-06 10:04:21 -0800 |
commit | dcfa895b512e3ed522b81b18baf3e33fd78a600c (patch) | |
tree | 67929b9cc83528a866f4d2afe8120a7a6fb2998a /tokio/src | |
parent | f0006006ed9938115011c42f26cff16842eb534f (diff) |
chore: use just std instead of ::std in paths (#2049)
Diffstat (limited to 'tokio/src')
-rw-r--r-- | tokio/src/io/split.rs | 2 | ||||
-rw-r--r-- | tokio/src/net/unix/ucred.rs | 5 | ||||
-rw-r--r-- | tokio/src/runtime/enter.rs | 2 | ||||
-rw-r--r-- | tokio/src/runtime/mod.rs | 2 | ||||
-rw-r--r-- | tokio/src/sync/mpsc/error.rs | 2 | ||||
-rw-r--r-- | tokio/src/sync/oneshot.rs | 4 | ||||
-rw-r--r-- | tokio/src/sync/semaphore_ll.rs | 4 | ||||
-rw-r--r-- | tokio/src/sync/watch.rs | 2 |
8 files changed, 10 insertions, 13 deletions
diff --git a/tokio/src/io/split.rs b/tokio/src/io/split.rs index a01ceef2..50cd498c 100644 --- a/tokio/src/io/split.rs +++ b/tokio/src/io/split.rs @@ -139,7 +139,7 @@ impl<T> Inner<T> { } else { // Spin... but investigate a better strategy - ::std::thread::yield_now(); + std::thread::yield_now(); cx.waker().wake_by_ref(); Poll::Pending diff --git a/tokio/src/net/unix/ucred.rs b/tokio/src/net/unix/ucred.rs index ccdf640b..cdd77ea4 100644 --- a/tokio/src/net/unix/ucred.rs +++ b/tokio/src/net/unix/ucred.rs @@ -125,10 +125,7 @@ pub(crate) mod impl_solaris { fn ucred_geteuid(cred: *const ucred_t) -> super::uid_t; fn ucred_getegid(cred: *const ucred_t) -> super::gid_t; - fn getpeerucred( - fd: ::std::os::raw::c_int, - cred: *mut *mut ucred_t, - ) -> ::std::os::raw::c_int; + fn getpeerucred(fd: std::os::raw::c_int, cred: *mut *mut ucred_t) -> std::os::raw::c_int; } pub(crate) fn get_peer_cred(sock: &UnixStream) -> io::Result<super::UCred> { diff --git a/tokio/src/runtime/enter.rs b/tokio/src/runtime/enter.rs index 35bb3581..bada8e7b 100644 --- a/tokio/src/runtime/enter.rs +++ b/tokio/src/runtime/enter.rs @@ -63,7 +63,7 @@ pub(crate) fn exit<F: FnOnce() -> R, R>(f: F) -> R { let reset = Reset; let ret = f(); - ::std::mem::forget(reset); + std::mem::forget(reset); ENTERED.with(|c| { assert!(!c.get(), "closure claimed permanent executor"); diff --git a/tokio/src/runtime/mod.rs b/tokio/src/runtime/mod.rs index 54524a91..6b857482 100644 --- a/tokio/src/runtime/mod.rs +++ b/tokio/src/runtime/mod.rs @@ -294,7 +294,7 @@ enum Kind { } /// After thread starts / before thread stops -type Callback = ::std::sync::Arc<dyn Fn() + Send + Sync>; +type Callback = std::sync::Arc<dyn Fn() + Send + Sync>; impl Runtime { /// Create a new runtime instance with default configuration values. diff --git a/tokio/src/sync/mpsc/error.rs b/tokio/src/sync/mpsc/error.rs index 4b8d9054..bc1f6465 100644 --- a/tokio/src/sync/mpsc/error.rs +++ b/tokio/src/sync/mpsc/error.rs @@ -13,7 +13,7 @@ impl<T> fmt::Display for SendError<T> { } } -impl<T: fmt::Debug> ::std::error::Error for SendError<T> {} +impl<T: fmt::Debug> std::error::Error for SendError<T> {} // ===== TrySendError ===== diff --git a/tokio/src/sync/oneshot.rs b/tokio/src/sync/oneshot.rs index 67094645..7b8ab355 100644 --- a/tokio/src/sync/oneshot.rs +++ b/tokio/src/sync/oneshot.rs @@ -57,7 +57,7 @@ pub mod error { } } - impl ::std::error::Error for RecvError {} + impl std::error::Error for RecvError {} // ===== impl TryRecvError ===== @@ -70,7 +70,7 @@ pub mod error { } } - impl ::std::error::Error for TryRecvError {} + impl std::error::Error for TryRecvError {} } use self::error::*; diff --git a/tokio/src/sync/semaphore_ll.rs b/tokio/src/sync/semaphore_ll.rs index baed5f0a..6550f13d 100644 --- a/tokio/src/sync/semaphore_ll.rs +++ b/tokio/src/sync/semaphore_ll.rs @@ -826,7 +826,7 @@ impl fmt::Display for AcquireError { } } -impl ::std::error::Error for AcquireError {} +impl std::error::Error for AcquireError {} // ===== impl TryAcquireError ===== @@ -858,7 +858,7 @@ impl fmt::Display for TryAcquireError { } } -impl ::std::error::Error for TryAcquireError {} +impl std::error::Error for TryAcquireError {} // ===== impl Waiter ===== diff --git a/tokio/src/sync/watch.rs b/tokio/src/sync/watch.rs index d6b82982..ebcad45c 100644 --- a/tokio/src/sync/watch.rs +++ b/tokio/src/sync/watch.rs @@ -117,7 +117,7 @@ pub mod error { } } - impl<T: fmt::Debug> ::std::error::Error for SendError<T> {} + impl<T: fmt::Debug> std::error::Error for SendError<T> {} } #[derive(Debug)] |