diff options
| author | bors <bors@rust-lang.org> | 2020-04-05 19:31:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-05 19:31:14 +0000 |
| commit | b543afca9b90ad6e4689b6d613ab51f9d3ba15e7 (patch) | |
| tree | 4262c77dc300c90a3b183a0f76653e6cc015158c /src/libstd/sync | |
| parent | 6387b09153939b2a104cd63148598a5f458de2c2 (diff) | |
| parent | 8c081f69fb35814710649c54cc23aff05c06881b (diff) | |
| download | rust-b543afca9b90ad6e4689b6d613ab51f9d3ba15e7.tar.gz rust-b543afca9b90ad6e4689b6d613ab51f9d3ba15e7.zip | |
Auto merge of #70816 - Dylan-DPC:rollup-kzcs8px, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #67797 (Query-ify Instance::resolve) - #70777 (Don't import integer and float modules, use assoc consts) - #70795 (Keep track of position when deleting from a BTreeMap) - #70812 (Do not use "nil" to refer to `()`) - #70815 (Enable layout debugging for `impl Trait` type aliases) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/shared.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/stream.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/sync/mpsc/shared.rs b/src/libstd/sync/mpsc/shared.rs index 2b0393573fd..c4e929624d7 100644 --- a/src/libstd/sync/mpsc/shared.rs +++ b/src/libstd/sync/mpsc/shared.rs @@ -12,7 +12,6 @@ use self::StartResult::*; use core::cmp; use core::intrinsics::abort; -use core::isize; use crate::cell::UnsafeCell; use crate::ptr; diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index 2e3270e81fc..f33493ee0c9 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -11,7 +11,6 @@ use self::Message::*; pub use self::UpgradeResult::*; use core::cmp; -use core::isize; use crate::cell::UnsafeCell; use crate::ptr; diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 79e86817154..3e2050799cc 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -26,7 +26,6 @@ use self::Blocker::*; pub use self::Failure::*; use core::intrinsics::abort; -use core::isize; use core::mem; use core::ptr; |