summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tokio/src/io/split.rs2
-rw-r--r--tokio/src/net/unix/ucred.rs5
-rw-r--r--tokio/src/runtime/enter.rs2
-rw-r--r--tokio/src/runtime/mod.rs2
-rw-r--r--tokio/src/sync/mpsc/error.rs2
-rw-r--r--tokio/src/sync/oneshot.rs4
-rw-r--r--tokio/src/sync/semaphore_ll.rs4
-rw-r--r--tokio/src/sync/watch.rs2
-rw-r--r--tokio/tests/rt_common.rs2
-rw-r--r--tokio/tests/sync_errors.rs2
10 files changed, 12 insertions, 15 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)]
diff --git a/tokio/tests/rt_common.rs b/tokio/tests/rt_common.rs
index 00256d05..15f5de6c 100644
--- a/tokio/tests/rt_common.rs
+++ b/tokio/tests/rt_common.rs
@@ -535,7 +535,7 @@ rt_test! {
impl Drop for Boom {
fn drop(&mut self) {
- assert!(::std::thread::panicking());
+ assert!(std::thread::panicking());
self.0.take().unwrap().send(()).unwrap();
}
}
diff --git a/tokio/tests/sync_errors.rs b/tokio/tests/sync_errors.rs
index 260f3be6..66e8f0c0 100644
--- a/tokio/tests/sync_errors.rs
+++ b/tokio/tests/sync_errors.rs
@@ -1,7 +1,7 @@
#![warn(rust_2018_idioms)]
#![cfg(feature = "full")]
-fn is_error<T: ::std::error::Error + Send + Sync>() {}
+fn is_error<T: std::error::Error + Send + Sync>() {}
#[test]
fn mpsc_error_bound() {