Tidy

Author: scottmcm

compiler/rustc_ast_lowering/src/lib.rs

@@ -324,7 +324,9 @@ pub fn lower_crate<'a, 'hir>(
         lifetimes_to_define: Vec::new(),
         is_collecting_in_band_lifetimes: false,
         in_scope_lifetimes: Vec::new(),
-        allow_try_trait: Some([sym::try_trait, sym::try_trait_v2, sym::control_flow_enum][..].into()),
+        allow_try_trait: Some(
+            [sym::try_trait, sym::try_trait_v2, sym::control_flow_enum][..].into(),
+        ),
         allow_gen_future: Some([sym::gen_future][..].into()),
     }
     .lower_crate(krate)

library/core/src/iter/traits/iterator.rs

@@ -3,9 +3,9 @@
 // can't split that into multiple files.
 
 use crate::cmp::{self, Ordering};
-use crate::ops::{self, Add, ControlFlow, Try};
 #[cfg(not(bootstrap))]
 use crate::ops::FromResidual;
+use crate::ops::{self, Add, ControlFlow, Try};
 
 use super::super::TrustedRandomAccess;
 use super::super::{Chain, Cloned, Copied, Cycle, Enumerate, Filter, FilterMap, Fuse};

library/core/src/ops/mod.rs

@@ -185,7 +185,7 @@ pub use self::range::{Bound, RangeBounds, RangeInclusive, RangeToInclusive};
 pub use self::r#try::Try2015;
 
 #[unstable(feature = "try_trait_v2", issue = "42327")]
-pub use self::r#try::{GetCorrespondingTryType, FromResidual, Try2021};
+pub use self::r#try::{FromResidual, GetCorrespondingTryType, Try2021};
 
 #[cfg(bootstrap)]
 #[unstable(feature = "try_trait_v2", issue = "42327")]

library/core/src/ops/try.rs

@@ -110,7 +110,10 @@ pub trait Try2021: FromResidual {
 
     /// Demonstration that this is usable for different-return-type scenarios (like `Iterator::try_find`).
     #[unstable(feature = "try_trait_v2", issue = "42327")]
-    fn map<T>(self, f: impl FnOnce(Self::Ok) -> T) -> <Self::Residual as GetCorrespondingTryType<T>>::Output
+    fn map<T>(
+        self,
+        f: impl FnOnce(Self::Ok) -> T,
+    ) -> <Self::Residual as GetCorrespondingTryType<T>>::Output
     where
         Self: Try2021,
         Self::Residual: GetCorrespondingTryType<T>,

src/test/ui/try-trait/try-non-generic-type.rs

@@ -40,7 +40,12 @@ impl FromResidual for ResultCode {
 
 impl<T, E: From<FancyError>> FromResidual<ResultCodeResidual> for Result<T, E> {
     fn from_residual(r: ResultCodeResidual) -> Self {
-        Err(FancyError(format!("Something fancy about {} at {:?}", r.0, std::time::SystemTime::now())).into())
+        Err(FancyError(format!(
+            "Something fancy about {} at {:?}",
+            r.0,
+            std::time::SystemTime::now()
+        ))
+        .into())
     }
 }