Merge of #666 - Minor gimli cleanup

Noticed while considering `backtrace_in_libstd`.
Figured it was worth making it more clear which imports *needed* std,
and removing some pointless casting and such.

Author: workingjubilee

src/symbolize/gimli/coff.rs

@@ -1,5 +1,7 @@
-use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use super::mystd::path::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

@@ -1,12 +1,14 @@
 #![allow(clippy::useless_conversion)]
 
-use super::mystd::ffi::{OsStr, OsString};
+use super::mystd::ffi::OsStr;
 use super::mystd::fs;
-use super::mystd::os::unix::ffi::{OsStrExt, OsStringExt};
+use super::mystd::os::unix::ffi::OsStrExt;
 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::string::String;
 use alloc::sync::Arc;
+use alloc::vec::Vec;
 use core::convert::{TryFrom, TryInto};
 use core::str;
 #[cfg(feature = "ruzstd")]
@@ -393,7 +395,7 @@ fn decompress_zstd(mut input: &[u8], mut output: &mut [u8]) -> Option<()> {
     Some(())
 }
 
-const DEBUG_PATH: &[u8] = b"/usr/lib/debug";
+const DEBUG_PATH: &str = "/usr/lib/debug";
 
 fn debug_path_exists() -> bool {
     cfg_if::cfg_if! {
@@ -403,7 +405,7 @@ fn debug_path_exists() -> bool {
 
             let mut exists = DEBUG_PATH_EXISTS.load(Ordering::Relaxed);
             if exists == 0 {
-                exists = if Path::new(OsStr::from_bytes(DEBUG_PATH)).is_dir() {
+                exists = if Path::new(DEBUG_PATH).is_dir() {
                     1
                 } else {
                     2
@@ -422,8 +424,8 @@ fn debug_path_exists() -> bool {
 /// The format of build id paths is documented at:
 /// https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
 fn locate_build_id(build_id: &[u8]) -> Option<PathBuf> {
-    const BUILD_ID_PATH: &[u8] = b"/usr/lib/debug/.build-id/";
-    const BUILD_ID_SUFFIX: &[u8] = b".debug";
+    const BUILD_ID_PATH: &str = "/usr/lib/debug/.build-id/";
+    const BUILD_ID_SUFFIX: &str = ".debug";
 
     if build_id.len() < 2 {
         return None;
@@ -434,25 +436,17 @@ fn locate_build_id(build_id: &[u8]) -> Option<PathBuf> {
     }
 
     let mut path =
-        Vec::with_capacity(BUILD_ID_PATH.len() + BUILD_ID_SUFFIX.len() + build_id.len() * 2 + 1);
-    path.extend(BUILD_ID_PATH);
-    path.push(hex(build_id[0] >> 4));
-    path.push(hex(build_id[0] & 0xf));
-    path.push(b'/');
+        String::with_capacity(BUILD_ID_PATH.len() + BUILD_ID_SUFFIX.len() + build_id.len() * 2 + 1);
+    path.push_str(BUILD_ID_PATH);
+    path.push(char::from_digit((build_id[0] >> 4) as u32, 16)?);
+    path.push(char::from_digit((build_id[0] & 0xf) as u32, 16)?);
+    path.push('/');
     for byte in &build_id[1..] {
-        path.push(hex(byte >> 4));
-        path.push(hex(byte & 0xf));
-    }
-    path.extend(BUILD_ID_SUFFIX);
-    Some(PathBuf::from(OsString::from_vec(path)))
-}
-
-fn hex(byte: u8) -> u8 {
-    if byte < 10 {
-        b'0' + byte
-    } else {
-        b'a' + byte - 10
+        path.push(char::from_digit((byte >> 4) as u32, 16)?);
+        path.push(char::from_digit((byte & 0xf) as u32, 16)?);
     }
+    path.push_str(BUILD_ID_SUFFIX);
+    Some(PathBuf::from(path))
 }
 
 /// Locate a file specified in a `.gnu_debuglink` section.
@@ -469,9 +463,8 @@ fn hex(byte: u8) -> u8 {
 fn locate_debuglink(path: &Path, filename: &[u8]) -> Option<PathBuf> {
     let path = fs::canonicalize(path).ok()?;
     let parent = path.parent()?;
-    let mut f = PathBuf::from(OsString::with_capacity(
-        DEBUG_PATH.len() + parent.as_os_str().len() + filename.len() + 2,
-    ));
+    let mut f =
+        PathBuf::with_capacity(DEBUG_PATH.len() + parent.as_os_str().len() + filename.len() + 2);
     let filename = Path::new(OsStr::from_bytes(filename));
 
     // Try "/parent/filename" if it differs from "path"
@@ -482,9 +475,7 @@ fn locate_debuglink(path: &Path, filename: &[u8]) -> Option<PathBuf> {
     }
 
     // Try "/parent/.debug/filename"
-    let mut s = OsString::from(f);
-    s.clear();
-    f = PathBuf::from(s);
+    f.clear();
     f.push(parent);
     f.push(".debug");
     f.push(filename);
@@ -494,10 +485,8 @@ fn locate_debuglink(path: &Path, filename: &[u8]) -> Option<PathBuf> {
 
     if debug_path_exists() {
         // Try "/usr/lib/debug/parent/filename"
-        let mut s = OsString::from(f);
-        s.clear();
-        f = PathBuf::from(s);
-        f.push(OsStr::from_bytes(DEBUG_PATH));
+        f.clear();
+        f.push(DEBUG_PATH);
         f.push(parent.strip_prefix("/").unwrap());
         f.push(filename);
         if f.is_file() {

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::{parse_running_mmaps, Library, LibrarySegment, OsString, Vec};
+use super::{parse_running_mmaps, Library, LibrarySegment};
+use alloc::borrow::ToOwned;
+use alloc::vec::Vec;
+use core::ffi::CStr;
 use core::slice;
 
 struct CallbackData {

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::path::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 _};