Directly use core and alloc instead of going through mystd where possible

This makes the api surface we require from std clearer. It is also more
consistent with existing direct usage of core and alloc.

Author: bjorn3

src/symbolize/gimli.rs

@@ -10,14 +10,14 @@ use super::BytesOrWideString;
 use super::ResolveWhat;
 use super::SymbolName;
 use addr2line::gimli;
+use alloc::vec::Vec;
 use core::convert::TryInto;
 use core::mem;
 use core::u32;
 use libc::c_void;
 use mystd::ffi::OsString;
 use mystd::fs::File;
 use mystd::path::Path;
-use mystd::prelude::v1::*;
 
 #[cfg(backtrace_in_libstd)]
 mod mystd {

src/symbolize/gimli/libs_aix.rs

@@ -1,11 +1,12 @@
-use super::mystd::borrow::ToOwned;
 use super::mystd::env;
-use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::ffi::OsStr;
 use super::mystd::io::Error;
-use super::mystd::os::unix::prelude::*;
+use super::mystd::os::unix::ffi::OsStrExt;
 use super::xcoff;
 use super::{Library, LibrarySegment, Vec};
+use alloc::borrow::ToOwned;
 use alloc::vec;
+use core::ffi::CStr;
 use core::mem;
 
 const EXE_IMAGE_BASE: u64 = 0x100000000;

src/symbolize/gimli/libs_dl_iterate_phdr.rs

@@ -2,11 +2,12 @@
 // and typically implement an API called `dl_iterate_phdr` to load
 // native libraries.
 
-use super::mystd::borrow::ToOwned;
 use super::mystd::env;
-use super::mystd::ffi::{CStr, OsStr};
-use super::mystd::os::unix::prelude::*;
+use super::mystd::ffi::OsStr;
+use super::mystd::os::unix::ffi::OsStrExt;
 use super::{Library, LibrarySegment, OsString, Vec};
+use alloc::borrow::ToOwned;
+use core::ffi::CStr;
 use core::slice;
 
 pub(super) fn native_libraries() -> Vec<Library> {

src/symbolize/gimli/libs_haiku.rs

@@ -5,11 +5,12 @@
 // that section. All the read-only segments of the ELF-binary are in
 // that part of the address space.
 
-use super::mystd::borrow::ToOwned;
-use super::mystd::ffi::{CStr, OsStr};
-use super::mystd::mem::MaybeUninit;
-use super::mystd::os::unix::prelude::*;
+use super::mystd::ffi::OsStr;
+use super::mystd::os::unix::ffi::OsStrExt;
 use super::{Library, LibrarySegment, Vec};
+use alloc::borrow::ToOwned;
+use core::ffi::CStr;
+use core::mem::MaybeUninit;
 
 pub(super) fn native_libraries() -> Vec<Library> {
     let mut libraries: Vec<Library> = Vec::new();

src/symbolize/gimli/libs_illumos.rs

@@ -1,7 +1,8 @@
-use super::mystd::borrow::ToOwned;
-use super::mystd::ffi::{CStr, OsStr};
-use super::mystd::os::unix::prelude::*;
+use super::mystd::ffi::OsStr;
+use super::mystd::os::unix::ffi::OsStrExt;
 use super::{Library, LibrarySegment, Vec};
+use alloc::borrow::ToOwned;
+use core::ffi::CStr;
 use core::mem;
 use object::NativeEndian;
 

src/symbolize/gimli/libs_macos.rs

@@ -1,10 +1,12 @@
 #![allow(deprecated)]
 
-use super::mystd::ffi::{CStr, OsStr};
-use super::mystd::os::unix::prelude::*;
-use super::mystd::prelude::v1::*;
+use super::mystd::ffi::OsStr;
+use super::mystd::os::unix::ffi::OsStrExt;
 use super::{Library, LibrarySegment};
+use alloc::borrow::ToOwned;
+use alloc::vec::Vec;
 use core::convert::TryInto;
+use core::ffi::CStr;
 use core::mem;
 
 // FIXME: replace with ptr::from_ref once MSRV is high enough

src/symbolize/gimli/libs_windows.rs

@@ -1,5 +1,5 @@
 use super::super::super::windows_sys::*;
-use super::mystd::os::windows::prelude::*;
+use super::mystd::os::windows::ffi::OsStringExt;
 use super::{coff, mmap, Library, LibrarySegment, OsString};
 use alloc::vec;
 use alloc::vec::Vec;

src/symbolize/gimli/macho.rs

@@ -1,4 +1,5 @@
-use super::{gimli, Box, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use alloc::boxed::Box;
 use alloc::sync::Arc;
 use core::convert::TryInto;
 use object::macho;
@@ -283,7 +284,7 @@ impl<'a> Object<'a> {
 
 fn object_mapping(file: &object::read::ObjectMapFile<'_>) -> Option<Mapping> {
     use super::mystd::ffi::OsStr;
-    use super::mystd::os::unix::prelude::*;
+    use super::mystd::os::unix::ffi::OsStrExt;
 
     let map = super::mmap(Path::new(OsStr::from_bytes(file.path())))?;
     let member_name = file.member();

src/symbolize/gimli/mmap_unix.rs

@@ -1,5 +1,5 @@
 use super::mystd::fs::File;
-use super::mystd::os::unix::prelude::*;
+use super::mystd::os::fd::AsRawFd;
 use core::ops::Deref;
 use core::ptr;
 use core::slice;

src/symbolize/gimli/mmap_windows.rs

@@ -1,7 +1,7 @@
 use super::super::super::windows_sys::*;
 
 use super::mystd::fs::File;
-use super::mystd::os::windows::prelude::*;
+use super::mystd::os::windows::io::AsRawHandle;
 use core::ffi::c_void;
 use core::ops::Deref;
 use core::ptr;

src/symbolize/gimli/parse_running_mmaps_unix.rs

@@ -2,10 +2,12 @@
 // in `mod libs_dl_iterate_phdr` (e.g. linux, freebsd, ...); it may be more
 // general purpose, but it hasn't been tested elsewhere.
 
+use super::mystd::ffi::OsString;
 use super::mystd::fs::File;
 use super::mystd::io::Read;
-use super::mystd::str::FromStr;
-use super::{OsString, String, Vec};
+use alloc::string::String;
+use alloc::vec::Vec;
+use core::str::FromStr;
 
 #[derive(PartialEq, Eq, Debug)]
 pub(super) struct MapsEntry {

src/symbolize/gimli/xcoff.rs

@@ -1,8 +1,8 @@
 use super::mystd::ffi::{OsStr, OsString};
 use super::mystd::os::unix::ffi::OsStrExt;
-use super::mystd::str;
 use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
 use alloc::sync::Arc;
+use core::str;
 use core::ops::Deref;
 use object::read::archive::ArchiveFile;
 use object::read::xcoff::{FileHeader, SectionHeader, XcoffFile, XcoffSymbol};