Fixup mystd imports

Author: CraftSpider

src/symbolize/gimli/coff.rs

@@ -1,5 +1,7 @@
-use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use super::mystd::fs::Path;
+use super::{gimli, Context, Endian, EndianSlice, Mapping, Stash};
 use alloc::sync::Arc;
+use alloc::vec::Vec;
 use core::convert::TryFrom;
 use object::pe::{ImageDosHeader, ImageSymbol};
 use object::read::coff::ImageSymbol as _;

src/symbolize/gimli/elf.rs

@@ -3,8 +3,9 @@ use super::mystd::fs;
 use super::mystd::os::unix::ffi::{OsStrExt, OsStringExt};
 use super::mystd::path::{Path, PathBuf};
 use super::Either;
-use super::{gimli, Context, Endian, EndianSlice, Mapping, Stash, Vec};
+use super::{gimli, Context, Endian, EndianSlice, Mapping, Stash};
 use alloc::sync::Arc;
+use alloc::vec::Vec;
 use core::convert::{TryFrom, TryInto};
 use core::str;
 use object::elf::{ELFCOMPRESS_ZLIB, ELF_NOTE_GNU, NT_GNU_BUILD_ID, SHF_COMPRESSED};

src/symbolize/gimli/libs_aix.rs

@@ -1,11 +1,13 @@
-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::xcoff;
-use super::{Library, LibrarySegment, Vec};
+use super::{Library, LibrarySegment};
+use alloc::borrow::ToOwned;
 use alloc::vec;
+use alloc::vec::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,13 @@
 // 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::ffi::{OsStr, OsString};
 use super::mystd::os::unix::prelude::*;
-use super::{Library, LibrarySegment, OsString, Vec};
+use super::{Library, LibrarySegment};
+use alloc::borrow::ToOwned;
+use alloc::vec::Vec;
+use core::ffi::CStr;
 use core::slice;
 
 pub(super) fn native_libraries() -> Vec<Library> {

src/symbolize/gimli/libs_haiku.rs

@@ -5,11 +5,13 @@
 // 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::ffi::OsStr;
 use super::mystd::os::unix::prelude::*;
-use super::{Library, LibrarySegment, Vec};
+use super::{Library, LibrarySegment};
+use alloc::borrow::ToOwned;
+use alloc::vec::Vec;
+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,9 @@
-use super::mystd::borrow::ToOwned;
-use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::ffi::OsStr;
 use super::mystd::os::unix::prelude::*;
-use super::{Library, LibrarySegment, Vec};
+use super::{Library, LibrarySegment};
+use alloc::borrow::ToOwned;
+use alloc::vec::Vec;
+use core::ffi::CStr;
 use core::mem;
 use object::NativeEndian;
 

src/symbolize/gimli/libs_libnx.rs

@@ -1,4 +1,5 @@
-use super::{Library, LibrarySegment, Vec};
+use super::{Library, LibrarySegment};
+use alloc::vec::Vec;
 
 // DevkitA64 doesn't natively support debug info, but the build system will
 // place debug info at the path `romfs:/debug_info.elf`.

src/symbolize/gimli/libs_macos.rs

@@ -1,10 +1,11 @@
 #![allow(deprecated)]
 
-use super::mystd::ffi::{CStr, OsStr};
+use super::mystd::ffi::OsStr;
 use super::mystd::os::unix::prelude::*;
 use super::mystd::prelude::v1::*;
 use super::{Library, LibrarySegment};
 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,6 +1,7 @@
 use super::super::super::windows_sys::*;
+use super::mystd::ffi::OsString;
 use super::mystd::os::windows::prelude::*;
-use super::{coff, mmap, Library, LibrarySegment, OsString};
+use super::{coff, mmap, Library, LibrarySegment};
 use alloc::vec;
 use alloc::vec::Vec;
 use core::mem;

src/symbolize/gimli/macho.rs

@@ -1,5 +1,8 @@
-use super::{gimli, Box, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use super::mystd::fs::Path;
+use super::{gimli, Context, Endian, EndianSlice, Mapping, Stash};
+use alloc::boxed::Box;
 use alloc::sync::Arc;
+use alloc::vec::Vec;
 use core::convert::TryInto;
 use object::macho;
 use object::read::macho::{MachHeader, Nlist, Section, Segment as _};

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::str::String;
+use alloc::vec::Vec;
+use core::str::FromStr;
 
 #[derive(PartialEq, Eq, Debug)]
 pub(super) struct MapsEntry {

src/symbolize/gimli/xcoff.rs

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