cargo +nightly fmt -- --config imports_granularity=Module,group_imports=StdExternalCrate

Author: mstange

etw-reader/src/etw_types.rs

@@ -1,6 +1,6 @@
+use std::cell::OnceCell;
 use std::ops::Deref;
 use std::rc::Rc;
-use std::cell::OnceCell;
 
 use rustc_hash::FxHashMap;
 use windows::core::{GUID, PCWSTR};

etw-reader/src/lib.rs

@@ -1,3 +1,7 @@
+use std::borrow::Cow;
+use std::mem;
+use std::path::Path;
+
 use memoffset::offset_of;
 pub use windows::core::GUID;
 use windows::core::{h, HSTRING, PWSTR};
@@ -11,10 +15,6 @@ use windows::Win32::System::Diagnostics::Etw::{
     TRACE_PROVIDER_INSTANCE_INFO,
 };
 
-use std::borrow::Cow;
-use std::mem;
-use std::path::Path;
-
 // typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE;
 pub(crate) type TraceHandle = u64;
 pub const INVALID_TRACE_HANDLE: TraceHandle = u64::MAX;
@@ -37,8 +37,7 @@ pub mod utils;
 use etw_types::EventRecord;
 use parser::{Parser, ParserError, TryParse};
 use schema::SchemaLocator;
-use tdh_types::{PrimitiveDesc, PropertyDesc, TdhInType};
-use tdh_types::{Property, TdhOutType};
+use tdh_types::{PrimitiveDesc, Property, PropertyDesc, TdhInType, TdhOutType};
 use traits::EncodeUtf16;
 
 #[repr(C)]

etw-reader/src/parser.rs

@@ -465,7 +465,7 @@ impl TryParse<f32> for Parser<'_> {
 ///
 /// # Arguments
 /// * `name` - Name of the property to be found in the Schema
-
+///
 /// # Example
 /// ```rust
 /// let my_callback = |record: EventRecord, schema_locator: &mut SchemaLocator| {

etw-reader/src/schema.rs

@@ -1,13 +1,13 @@
 //! ETW Event Schema locator and handler
 //!
 //! This module contains the means needed to locate and interact with the Schema of an ETW event
+use std::cell::OnceCell;
 use std::collections::hash_map::Entry;
 use std::rc::Rc;
-use std::cell::OnceCell;
 
+use rustc_hash::FxHashMap;
 use windows::core::GUID;
 use windows::Win32::System::Diagnostics::Etw::{self, EVENT_HEADER_FLAG_64_BIT_HEADER};
-use rustc_hash::FxHashMap;
 
 use super::etw_types::{DecodingSource, EventRecord, TraceEventInfoRaw};
 use super::property::PropertyIter;

fxprof-processed-profile/src/category.rs

@@ -3,10 +3,9 @@ use std::hash::Hash;
 use indexmap::Equivalent;
 use serde::ser::{Serialize, SerializeMap, Serializer};
 
-use crate::Profile;
-
 use super::category_color::CategoryColor;
 use super::fast_hash_map::FastIndexSet;
+use crate::Profile;
 
 /// Implemented by [`Category`], [`Subcategory`], [`CategoryHandle`] and [`SubcategoryHandle`].
 pub trait IntoSubcategoryHandle {

samply/src/linux_shared/vdso.rs

@@ -1,5 +1,6 @@
-use object::Object;
 use std::sync::OnceLock;
+
+use object::Object;
 use wholesym::{CodeId, ElfBuildId};
 
 /// Returns the memory address range in this process where the VDSO is mapped.

samply/src/windows/coreclr.rs

@@ -8,12 +8,11 @@ use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 
 use super::elevated_helper::ElevatedRecordingProps;
-use crate::shared::recording_props::{CoreClrProfileProps, ProfileCreationProps};
-use crate::windows::profile_context::ProfileContext;
-
 use super::etw_reader::event_properties_to_string;
 use super::etw_reader::parser::{Parser, TryParse};
 use super::etw_reader::schema::TypedEvent;
+use crate::shared::recording_props::{CoreClrProfileProps, ProfileCreationProps};
+use crate::windows::profile_context::ProfileContext;
 
 const CORE_CLR_GC_CATEGORY: Category<'static> = Category("CoreCLR GC", CategoryColor::Red);
 

samply/src/windows/etw_gecko.rs

@@ -7,15 +7,14 @@ use fxprof_processed_profile::debugid;
 use uuid::Uuid;
 
 use super::coreclr::CoreClrContext;
-use super::profile_context::ProfileContext;
-use crate::windows::coreclr;
-use crate::windows::profile_context::PeInfo;
-
 use super::etw_reader::parser::{Address, Parser, TryParse};
 use super::etw_reader::schema::SchemaLocator;
 use super::etw_reader::{
     add_custom_schemas, event_properties_to_string, open_trace, print_property, GUID,
 };
+use super::profile_context::ProfileContext;
+use crate::windows::coreclr;
+use crate::windows::profile_context::PeInfo;
 
 pub fn process_etl_files(
     context: &mut ProfileContext,

samply/src/windows/etw_reader/mod.rs

@@ -1,3 +1,7 @@
+use std::borrow::Cow;
+use std::mem;
+use std::path::Path;
+
 use memoffset::offset_of;
 pub use windows::core::GUID;
 use windows::core::{h, HSTRING, PWSTR};
@@ -11,10 +15,6 @@ use windows::Win32::System::Diagnostics::Etw::{
     TRACE_PROVIDER_INSTANCE_INFO,
 };
 
-use std::borrow::Cow;
-use std::mem;
-use std::path::Path;
-
 // typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE;
 pub(crate) type TraceHandle = u64;
 pub const INVALID_TRACE_HANDLE: TraceHandle = u64::MAX;
@@ -37,8 +37,7 @@ pub mod utils;
 use etw_types::EventRecord;
 use parser::{Parser, ParserError, TryParse};
 use schema::SchemaLocator;
-use tdh_types::{PrimitiveDesc, PropertyDesc, TdhInType};
-use tdh_types::{Property, TdhOutType};
+use tdh_types::{PrimitiveDesc, Property, PropertyDesc, TdhInType, TdhOutType};
 use traits::EncodeUtf16;
 
 #[repr(C)]