style: Run cargo fmt against new changes

tokio-rs · May 8, 2023 · 6ed92b6 · 6ed92b6
1 parent 282bd78
commit 6ed92b6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/tracing-attributes/src/attr.rs b/tracing-attributes/src/attr.rs
@@ -163,18 +163,17 @@ impl Parse for EventArgs {
         let content;
         let _ = syn::parenthesized!(content in input);
         let mut result = Self::default();
-        let mut parse_one_arg =
-            || {
-                let lookahead = content.lookahead1();
-                if lookahead.peek(kw::level) {
-                    if result.level.is_some() {
-                        return Err(content.error("expected only a single `level` argument"));
-                    }
-                    result.level = Some(content.parse()?);
-                } else if result.mode != FormatMode::default() {
-                    return Err(content.error("expected only a single format argument"));
-                } else if let Some(ident) = content.parse::<Option<Ident>>()? {
-                    match ident.to_string().as_str() {
+        let mut parse_one_arg = || {
+            let lookahead = content.lookahead1();
+            if lookahead.peek(kw::level) {
+                if result.level.is_some() {
+                    return Err(content.error("expected only a single `level` argument"));
+                }
+                result.level = Some(content.parse()?);
+            } else if result.mode != FormatMode::default() {
+                return Err(content.error("expected only a single format argument"));
+            } else if let Some(ident) = content.parse::<Option<Ident>>()? {
+                match ident.to_string().as_str() {
                         "Debug" => result.mode = FormatMode::Debug,
                         "Display" => result.mode = FormatMode::Display,
                         "Raw" => result.mode = FormatMode::Raw,
@@ -183,9 +182,9 @@ impl Parse for EventArgs {
                             "unknown event formatting mode, expected either `Debug`, `Display`, or `Raw`",
                         )),
                     }
-                }
-                Ok(())
-            };
+            }
+            Ok(())
+        };
         parse_one_arg()?;
         if !content.is_empty() {
             if content.lookahead1().peek(Token![,]) {

diff --git a/tracing-attributes/src/lib.rs b/tracing-attributes/src/lib.rs
@@ -258,10 +258,10 @@ mod expand;
 ///     42
 /// }
 /// ```
-/// 
+///
 /// If the value being returned implements `tracing::field::Value`, you can optionally record it
 /// in its raw form using `ret(Raw)`:
-/// 
+///
 /// ```
 /// # use tracing_attributes::instrument;
 /// #[instrument(ret(Raw))]
@@ -305,11 +305,11 @@ mod expand;
 ///     Ok(())
 /// }
 /// ```
-/// 
+///
 /// If you're returning a `Result<T, E>` and `E` implements [`std::error::Error`], you can
 /// record the raw error value using `err(Raw)`. This can be useful when paired with a subscriber
 /// which specially handles errors, like `tracing_opentelemetry`:
-/// 
+///
 /// ```
 /// # use tracing_attributes::instrument;
 /// #[instrument(err(Raw))]

diff --git a/tracing-attributes/tests/ret.rs b/tracing-attributes/tests/ret.rs
@@ -214,7 +214,11 @@ fn test_ret_and_err() {
                 .with_fields(
                     expect::field("error")
                         .with_value(&tracing::field::display(u8::try_from(1234).unwrap_err()))
-                        .and(expect::field("message").with_value(&tracing::field::display(u8::try_from(1234).unwrap_err())))
+                        .and(
+                            expect::field("message").with_value(&tracing::field::display(
+                                u8::try_from(1234).unwrap_err(),
+                            )),
+                        )
                         .only(),
                 )
                 .at_level(Level::ERROR),
@@ -244,7 +248,10 @@ fn test_ret_and_ok() {
                 .with_fields(
                     expect::field("return")
                         .with_value(&tracing::field::debug(u8::try_from(123).unwrap()))
-                        .and(expect::field("message").with_value(&tracing::field::debug(u8::try_from(123).unwrap())))
+                        .and(
+                            expect::field("message")
+                                .with_value(&tracing::field::debug(u8::try_from(123).unwrap())),
+                        )
                         .only(),
                 )
                 .at_level(Level::INFO),