Skip to content

Commit ad30865

Browse files
committed
Format with rustfmt
1 parent 1a5f7c8 commit ad30865

2 files changed

Lines changed: 41 additions & 10 deletions

File tree

src/backtrace.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ macro_rules! backtrace_if_absent {
4545
};
4646
}
4747

48-
#[cfg(all(feature = "std", not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
48+
#[cfg(all(
49+
feature = "std",
50+
not(error_generic_member_access),
51+
any(std_backtrace, feature = "backtrace")
52+
))]
4953
macro_rules! backtrace_if_absent {
5054
($err:expr) => {
5155
backtrace!()

src/error.rs

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ impl Error {
9999
#[cfg(anyhow_no_ptr_addr_of)]
100100
object_downcast_mut: object_downcast_mut::<E>,
101101
object_drop_rest: object_drop_front::<E>,
102-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
102+
#[cfg(all(
103+
not(error_generic_member_access),
104+
any(std_backtrace, feature = "backtrace")
105+
))]
103106
object_backtrace: no_backtrace,
104107
};
105108

@@ -124,7 +127,10 @@ impl Error {
124127
#[cfg(anyhow_no_ptr_addr_of)]
125128
object_downcast_mut: object_downcast_mut::<M>,
126129
object_drop_rest: object_drop_front::<M>,
127-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
130+
#[cfg(all(
131+
not(error_generic_member_access),
132+
any(std_backtrace, feature = "backtrace")
133+
))]
128134
object_backtrace: no_backtrace,
129135
};
130136

@@ -150,7 +156,10 @@ impl Error {
150156
#[cfg(anyhow_no_ptr_addr_of)]
151157
object_downcast_mut: object_downcast_mut::<M>,
152158
object_drop_rest: object_drop_front::<M>,
153-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
159+
#[cfg(all(
160+
not(error_generic_member_access),
161+
any(std_backtrace, feature = "backtrace")
162+
))]
154163
object_backtrace: no_backtrace,
155164
};
156165

@@ -178,7 +187,10 @@ impl Error {
178187
#[cfg(anyhow_no_ptr_addr_of)]
179188
object_downcast_mut: context_downcast_mut::<C, E>,
180189
object_drop_rest: context_drop_rest::<C, E>,
181-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
190+
#[cfg(all(
191+
not(error_generic_member_access),
192+
any(std_backtrace, feature = "backtrace")
193+
))]
182194
object_backtrace: no_backtrace,
183195
};
184196

@@ -204,7 +216,10 @@ impl Error {
204216
#[cfg(anyhow_no_ptr_addr_of)]
205217
object_downcast_mut: object_downcast_mut::<Box<dyn StdError + Send + Sync>>,
206218
object_drop_rest: object_drop_front::<Box<dyn StdError + Send + Sync>>,
207-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
219+
#[cfg(all(
220+
not(error_generic_member_access),
221+
any(std_backtrace, feature = "backtrace")
222+
))]
208223
object_backtrace: no_backtrace,
209224
};
210225

@@ -317,7 +332,10 @@ impl Error {
317332
#[cfg(anyhow_no_ptr_addr_of)]
318333
object_downcast_mut: context_chain_downcast_mut::<C>,
319334
object_drop_rest: context_chain_drop_rest::<C>,
320-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
335+
#[cfg(all(
336+
not(error_generic_member_access),
337+
any(std_backtrace, feature = "backtrace")
338+
))]
321339
object_backtrace: context_backtrace::<C>,
322340
};
323341

@@ -598,7 +616,10 @@ struct ErrorVTable {
598616
#[cfg(anyhow_no_ptr_addr_of)]
599617
object_downcast_mut: unsafe fn(Mut<ErrorImpl>, TypeId) -> Option<Mut<()>>,
600618
object_drop_rest: unsafe fn(Own<ErrorImpl>, TypeId),
601-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
619+
#[cfg(all(
620+
not(error_generic_member_access),
621+
any(std_backtrace, feature = "backtrace")
622+
))]
602623
object_backtrace: unsafe fn(Ref<ErrorImpl>) -> Option<&Backtrace>,
603624
}
604625

@@ -703,7 +724,10 @@ where
703724
}
704725
}
705726

706-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
727+
#[cfg(all(
728+
not(error_generic_member_access),
729+
any(std_backtrace, feature = "backtrace")
730+
))]
707731
fn no_backtrace(e: Ref<ErrorImpl>) -> Option<&Backtrace> {
708732
let _ = e;
709733
None
@@ -824,7 +848,10 @@ where
824848
}
825849

826850
// Safety: requires layout of *e to match ErrorImpl<ContextError<C, Error>>.
827-
#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))]
851+
#[cfg(all(
852+
not(error_generic_member_access),
853+
any(std_backtrace, feature = "backtrace")
854+
))]
828855
#[allow(clippy::unnecessary_wraps)]
829856
unsafe fn context_backtrace<C>(e: Ref<ErrorImpl>) -> Option<&Backtrace>
830857
where

0 commit comments

Comments
 (0)