Cargo fmt

Author: MichaReiser

components/salsa-macro-rules/src/return_mode.rs

@@ -18,7 +18,7 @@ macro_rules! return_mode_expression {
     ) => {
         ::core::clone::Clone::clone($field_ref_expr)
     };
-    
+
     (
         (ref, $maybe_backdate:ident, $maybe_default:ident),
         $field_ty:ty,
@@ -34,15 +34,15 @@ macro_rules! return_mode_expression {
     ) => {
         ::core::ops::Deref::deref($field_ref_expr)
     };
-    
+
     (
         (as_ref, $maybe_backdate:ident, $maybe_default:ident),
         $field_ty:ty,
         $field_ref_expr:expr,
     ) => {
         ::salsa::SalsaAsRef::as_ref($field_ref_expr)
     };
-    
+
     (
         (as_deref, $maybe_backdate:ident, $maybe_default:ident),
         $field_ty:ty,

components/salsa-macros/src/salsa_struct.rs

@@ -389,8 +389,14 @@ impl<'s> SalsaField<'s> {
         }
 
         // Validate return mode
-        if !ALLOWED_RETURN_MODES.iter().any(|mode| mode == &result.returns.to_string()) {
-            return Err(syn::Error::new(result.returns.span(), format!("Invalid return mode. Allowed modes are: {ALLOWED_RETURN_MODES:?}")));
+        if !ALLOWED_RETURN_MODES
+            .iter()
+            .any(|mode| mode == &result.returns.to_string())
+        {
+            return Err(syn::Error::new(
+                result.returns.span(),
+                format!("Invalid return mode. Allowed modes are: {ALLOWED_RETURN_MODES:?}"),
+            ));
         }
 
         Ok(result)

components/salsa-macros/src/tracked_fn.rs

@@ -155,8 +155,14 @@ impl Macro {
             .unwrap_or(Ident::new("clone", Span::call_site()));
 
         // Validate return mode
-        if !ALLOWED_RETURN_MODES.iter().any(|mode| mode == &return_mode.to_string()) {
-            return Err(syn::Error::new(return_mode.span(), format!("Invalid return mode. Allowed modes are: {ALLOWED_RETURN_MODES:?}")));
+        if !ALLOWED_RETURN_MODES
+            .iter()
+            .any(|mode| mode == &return_mode.to_string())
+        {
+            return Err(syn::Error::new(
+                return_mode.span(),
+                format!("Invalid return mode. Allowed modes are: {ALLOWED_RETURN_MODES:?}"),
+            ));
         }
 
         // The path expression is responsible for emitting the primary span in the diagnostic we

src/return_mode.rs

@@ -5,22 +5,30 @@ use std::ops::Deref;
 /// Used to determine the return type and value for tracked fields and functions annotated with `returns(as_ref)`.
 pub trait SalsaAsRef {
     // The type returned by tracked fields and functions annotated with `returns(as_ref)`.
-    type AsRef<'a> where Self: 'a;
+    type AsRef<'a>
+    where
+        Self: 'a;
 
     // The value returned by tracked fields and functions annotated with `returns(as_ref)`.
     fn as_ref(&self) -> Self::AsRef<'_>;
 }
 
 impl<T> SalsaAsRef for Option<T> {
-    type AsRef<'a> = Option<&'a T> where Self: 'a;
+    type AsRef<'a>
+        = Option<&'a T>
+    where
+        Self: 'a;
 
     fn as_ref(&self) -> Self::AsRef<'_> {
         self.as_ref()
     }
 }
 
 impl<T, E> SalsaAsRef for Result<T, E> {
-    type AsRef<'a> = Result<&'a T, &'a E> where Self: 'a;
+    type AsRef<'a>
+        = Result<&'a T, &'a E>
+    where
+        Self: 'a;
 
     fn as_ref(&self) -> Self::AsRef<'_> {
         self.as_ref()
@@ -30,22 +38,30 @@ impl<T, E> SalsaAsRef for Result<T, E> {
 /// Used to determine the return type and value for tracked fields and functions annotated with `returns(as_deref)`.
 pub trait SalsaAsDeref {
     // The type returned by tracked fields and functions annotated with `returns(as_deref)`.
-    type AsDeref<'a> where Self: 'a;
+    type AsDeref<'a>
+    where
+        Self: 'a;
 
     // The value returned by tracked fields and functions annotated with `returns(as_deref)`.
     fn as_deref(&self) -> Self::AsDeref<'_>;
 }
 
 impl<T: Deref> SalsaAsDeref for Option<T> {
-    type AsDeref<'a> = Option<&'a T::Target> where Self: 'a;
+    type AsDeref<'a>
+        = Option<&'a T::Target>
+    where
+        Self: 'a;
 
     fn as_deref(&self) -> Self::AsDeref<'_> {
         self.as_deref()
     }
 }
 
 impl<T: Deref, E> SalsaAsDeref for Result<T, E> {
-    type AsDeref<'a> = Result<&'a T::Target, &'a E> where Self: 'a;
+    type AsDeref<'a>
+        = Result<&'a T::Target, &'a E>
+    where
+        Self: 'a;
 
     fn as_deref(&self) -> Self::AsDeref<'_> {
         self.as_deref()

tests/return_mode.rs

@@ -169,4 +169,4 @@ fn as_deref_test() {
         "#]]
         .assert_debug_eq(&x);
     })
-}
+}