Reorder use statements.

Author: mstange

samply-symbols/src/binary_image.rs

@@ -5,14 +5,13 @@ use object::{
     FileKind, Object, ReadRef,
 };
 
-use crate::{
-    debug_id_and_code_id_for_jitdump, debug_id_for_object,
-    debugid_util::code_id_for_object,
-    jitdump::JitDumpIndex,
-    macho::{DyldCacheFileData, MachOData, MachOFatArchiveMemberData, ObjectAndMachOData},
-    relative_address_base,
-    shared::{FileContentsWrapper, LibraryInfo, PeCodeId, RangeReadRef},
-    CodeId, ElfBuildId, Error, FileAndPathHelperError, FileContents,
+use crate::debugid_util::{code_id_for_object, debug_id_for_object};
+use crate::error::Error;
+use crate::jitdump::{debug_id_and_code_id_for_jitdump, JitDumpIndex};
+use crate::macho::{DyldCacheFileData, MachOData, MachOFatArchiveMemberData, ObjectAndMachOData};
+use crate::shared::{
+    relative_address_base, CodeId, ElfBuildId, FileAndPathHelperError, FileContents,
+    FileContentsWrapper, LibraryInfo, PeCodeId, RangeReadRef,
 };
 
 #[derive(thiserror::Error, Debug)]

samply-symbols/src/cache.rs

@@ -1,13 +1,10 @@
-use std::{
-    collections::HashMap,
-    ops::Range,
-    sync::{atomic::AtomicUsize, Mutex},
-};
-
-use crate::chunked_read_buffer_manager::{ChunkedReadBufferManager, RangeLocation, RangeSourcing};
+use std::collections::HashMap;
+use std::ops::Range;
+use std::sync::{atomic::AtomicUsize, Mutex};
 
 use elsa::sync::FrozenVec;
 
+use crate::chunked_read_buffer_manager::{ChunkedReadBufferManager, RangeLocation, RangeSourcing};
 use crate::{FileAndPathHelperResult, FileContents};
 
 const CHUNK_SIZE: u64 = 32 * 1024;

samply-symbols/src/chunked_read_buffer_manager.rs

@@ -1,6 +1,7 @@
-use rangemap::RangeMap;
 use std::ops::Range;
 
+use rangemap::RangeMap;
+
 pub struct ChunkedReadBufferManager<const CHUNK_SIZE: u64> {
     file_len: u64,
     buffer_ranges: Vec<BufferRange>,

samply-symbols/src/dwarf.rs

@@ -1,8 +1,5 @@
 use std::marker::PhantomData;
 
-use crate::path_mapper::PathMapper;
-use crate::shared::FrameDebugInfo;
-use crate::{demangle, Error, SourceFilePath};
 use addr2line::fallible_iterator;
 use addr2line::gimli;
 use elsa::sync::FrozenVec;
@@ -11,6 +8,10 @@ use gimli::{EndianSlice, Reader, RunTimeEndian, SectionId};
 use object::read::ReadRef;
 use object::{CompressedFileRange, CompressionFormat};
 
+use crate::path_mapper::PathMapper;
+use crate::shared::FrameDebugInfo;
+use crate::{demangle, Error, SourceFilePath};
+
 pub fn get_frames<R: Reader>(
     address: u64,
     context: Option<&addr2line::Context<R>>,

samply-symbols/src/elf.rs

@@ -1,14 +1,15 @@
+use debugid::DebugId;
+use gimli::{CieOrFde, EhFrame, UnwindSection};
+use object::{File, FileKind, Object, ObjectSection, ReadRef};
+use std::io::Cursor;
+
 use crate::error::Error;
-use crate::shared::{FileContents, FileContentsWrapper};
+use crate::shared::{FileAndPathHelper, FileContents, FileContentsWrapper, FileLocation};
 use crate::symbol_map::{
     GenericSymbolMap, SymbolMap, SymbolMapDataMidTrait, SymbolMapDataOuterTrait,
 };
 use crate::symbol_map_object::{FunctionAddressesComputer, ObjectSymbolMapDataMid};
-use crate::{debug_id_for_object, ElfBuildId, FileAndPathHelper, FileLocation};
-use debugid::DebugId;
-use gimli::{CieOrFde, EhFrame, UnwindSection};
-use object::{File, FileKind, Object, ObjectSection, ReadRef};
-use std::io::Cursor;
+use crate::{debug_id_for_object, ElfBuildId};
 
 pub async fn load_symbol_map_for_elf<'h, T, FL, H>(
     file_location: FL,

samply-symbols/src/external_file.rs

@@ -4,12 +4,13 @@ use object::{read::archive::ArchiveFile, File, FileKind, ReadRef};
 use yoke::Yoke;
 use yoke_derive::Yokeable;
 
-use crate::{
-    dwarf::{get_frames, Addr2lineContextData},
-    macho,
-    path_mapper::PathMapper,
-    shared::{ExternalFileAddressInFileRef, ExternalFileRef, FileContentsWrapper, RangeReadRef},
-    Error, FileAndPathHelper, FileContents, FileLocation, FrameDebugInfo, MultiArchDisambiguator,
+use crate::dwarf::{get_frames, Addr2lineContextData};
+use crate::error::Error;
+use crate::macho;
+use crate::path_mapper::PathMapper;
+use crate::shared::{
+    ExternalFileAddressInFileRef, ExternalFileRef, FileAndPathHelper, FileContents,
+    FileContentsWrapper, FileLocation, FrameDebugInfo, MultiArchDisambiguator, RangeReadRef,
 };
 
 pub async fn load_external_file<'h, H>(

samply-symbols/src/jitdump.rs

@@ -12,12 +12,12 @@ use std::{
     sync::Mutex,
 };
 
-use crate::shared::FileContentsCursor;
-use crate::{
-    symbol_map::{SymbolMapInnerWrapper, SymbolMapTrait},
-    AddressInfo, Error, FileContents, FileContentsWrapper, FileLocation, FrameDebugInfo,
-    FramesLookupResult, SourceFilePath, SymbolInfo, SymbolMap,
+use crate::error::Error;
+use crate::shared::{
+    AddressInfo, FileContents, FileContentsCursor, FileContentsWrapper, FileLocation,
+    FrameDebugInfo, FramesLookupResult, SourceFilePath, SymbolInfo,
 };
+use crate::symbol_map::{SymbolMap, SymbolMapInnerWrapper, SymbolMapTrait};
 
 pub fn is_jitdump_file<T: FileContents>(file_contents: &FileContentsWrapper<T>) -> bool {
     const MAGIC_BYTES_BE: &[u8] = b"JiTD";

samply-symbols/src/macho.rs

@@ -1,11 +1,5 @@
-use crate::binary_image::BinaryImageInner;
-use crate::error::Error;
-use crate::shared::{FileAndPathHelper, FileContents, FileContentsWrapper, RangeReadRef};
-use crate::symbol_map::{
-    GenericSymbolMap, SymbolMap, SymbolMapDataMidTrait, SymbolMapDataOuterTrait,
-};
-use crate::symbol_map_object::{FunctionAddressesComputer, ObjectSymbolMapDataMid};
-use crate::{debug_id_for_object, BinaryImage, FileLocation, MultiArchDisambiguator};
+use std::marker::PhantomData;
+
 use debugid::DebugId;
 use macho_unwind_info::UnwindInfo;
 use object::macho::{self, LinkeditDataCommand, MachHeader32, MachHeader64};
@@ -14,9 +8,21 @@ use object::read::macho::{
 };
 use object::read::{File, Object, ObjectSection};
 use object::{Endianness, FileKind, ReadRef};
-use std::marker::PhantomData;
 use uuid::Uuid;
 
+use crate::binary_image::BinaryImage;
+use crate::binary_image::BinaryImageInner;
+use crate::debugid_util::debug_id_for_object;
+use crate::error::Error;
+use crate::shared::{
+    FileAndPathHelper, FileContents, FileContentsWrapper, FileLocation, MultiArchDisambiguator,
+    RangeReadRef,
+};
+use crate::symbol_map::{
+    GenericSymbolMap, SymbolMap, SymbolMapDataMidTrait, SymbolMapDataOuterTrait,
+};
+use crate::symbol_map_object::{FunctionAddressesComputer, ObjectSymbolMapDataMid};
+
 /// Converts a cpu type/subtype pair into the architecture name.
 ///
 /// For example, this converts `CPU_TYPE_ARM64, CPU_SUBTYPE_ARM64E` to `Some("arm64e")`.

samply-symbols/src/path_mapper.rs

@@ -1,13 +1,13 @@
+use std::collections::HashMap;
+
 use nom::branch::alt;
 use nom::bytes::complete::{tag, take_till1, take_until1, take_while1};
 use nom::character::complete::one_of;
 use nom::error::ErrorKind;
 use nom::sequence::{delimited, preceded, terminated, tuple};
 use nom::Err;
 
-use crate::MappedPath;
-
-use std::collections::HashMap;
+use crate::mapped_path::MappedPath;
 
 pub trait ExtraPathMapper {
     fn map_path(&mut self, path: &str) -> Option<MappedPath>;

samply-symbols/src/shared.rs

@@ -1,16 +1,16 @@
-use debugid::DebugId;
-use object::read::ReadRef;
-use object::FileFlags;
-use uuid::Uuid;
-
-use crate::MappedPath;
-
 use std::fmt::{Debug, Display};
 use std::future::Future;
 use std::ops::Range;
 use std::str::FromStr;
 use std::{marker::PhantomData, ops::Deref};
 
+use debugid::DebugId;
+use object::read::ReadRef;
+use object::FileFlags;
+use uuid::Uuid;
+
+use crate::mapped_path::MappedPath;
+
 #[cfg(feature = "partial_read_stats")]
 use bitvec::{bitvec, prelude::BitVec};
 #[cfg(feature = "partial_read_stats")]

samply-symbols/src/symbol_map.rs

@@ -4,7 +4,8 @@ use debugid::DebugId;
 use yoke::Yoke;
 use yoke_derive::Yokeable;
 
-use crate::{shared::AddressInfo, Error, FileLocation};
+use crate::error::Error;
+use crate::shared::{AddressInfo, FileLocation};
 
 pub struct SymbolMap<FL: FileLocation> {
     debug_file_location: FL,

samply-symbols/src/symbol_map_object.rs

@@ -6,18 +6,15 @@ use object::{
     SectionKind, SymbolKind,
 };
 
-use crate::ExternalFileAddressRef;
-use crate::{
-    demangle,
-    dwarf::{get_frames, Addr2lineContextData},
-    path_mapper::PathMapper,
-    shared::{
-        relative_address_base, AddressInfo, ExternalFileAddressInFileRef, ExternalFileRef,
-        SymbolInfo,
-    },
-    symbol_map::{SymbolMapDataMidTrait, SymbolMapInnerWrapper, SymbolMapTrait},
-    Error, FramesLookupResult,
+use crate::demangle;
+use crate::dwarf::{get_frames, Addr2lineContextData};
+use crate::error::Error;
+use crate::path_mapper::PathMapper;
+use crate::shared::{
+    relative_address_base, AddressInfo, ExternalFileAddressInFileRef, ExternalFileAddressRef,
+    ExternalFileRef, FramesLookupResult, SymbolInfo,
 };
+use crate::symbol_map::{SymbolMapDataMidTrait, SymbolMapInnerWrapper, SymbolMapTrait};
 
 pub trait FunctionAddressesComputer<'data> {
     fn compute_function_addresses<'file, O>(

samply-symbols/src/windows.rs

@@ -1,27 +1,30 @@
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::ops::Deref;
+use std::sync::Mutex;
+
+use debugid::DebugId;
+use nom::bytes::complete::{tag, take_until1};
+use nom::combinator::eof;
+use nom::sequence::terminated;
+use object::{File, FileKind};
+use pdb::PDB;
+use pdb_addr2line::pdb;
+
 use crate::debugid_util::debug_id_for_object;
+use crate::demangle;
 use crate::error::{Context, Error};
+use crate::mapped_path::MappedPath;
 use crate::path_mapper::{ExtraPathMapper, PathMapper};
 use crate::shared::{
-    AddressInfo, FileAndPathHelper, FileContents, FileContentsWrapper, FrameDebugInfo,
-    FramesLookupResult, SymbolInfo,
+    AddressInfo, FileAndPathHelper, FileContents, FileContentsWrapper, FileLocation,
+    FrameDebugInfo, FramesLookupResult, SourceFilePath, SymbolInfo,
 };
 use crate::symbol_map::{
     GenericSymbolMap, SymbolMap, SymbolMapDataMidTrait, SymbolMapDataOuterTrait,
     SymbolMapInnerWrapper, SymbolMapTrait,
 };
 use crate::symbol_map_object::{FunctionAddressesComputer, ObjectSymbolMapDataMid};
-use crate::{demangle, FileLocation, MappedPath, SourceFilePath};
-use debugid::DebugId;
-use nom::bytes::complete::{tag, take_until1};
-use nom::combinator::eof;
-use nom::sequence::terminated;
-use object::{File, FileKind};
-use pdb::PDB;
-use pdb_addr2line::pdb;
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::ops::Deref;
-use std::sync::Mutex;
 
 pub async fn load_symbol_map_for_pdb_corresponding_to_binary<
     'h,