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/sys | |
| parent | 6387b09153939b2a104cd63148598a5f458de2c2 (diff) | |
| parent | 8c081f69fb35814710649c54cc23aff05c06881b (diff) | |
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/sys')
| -rw-r--r-- | src/libstd/sys/hermit/thread.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys/hermit/thread.rs b/src/libstd/sys/hermit/thread.rs index c7bea168f34..34f88eea0d7 100644 --- a/src/libstd/sys/hermit/thread.rs +++ b/src/libstd/sys/hermit/thread.rs @@ -6,7 +6,6 @@ use crate::io; use crate::mem; use crate::sys::hermit::abi; use crate::time::Duration; -use core::u32; pub type Tid = abi::Tid; |