Version gate the new trace! formatting

Author: samtay

src/overflow.rs

@@ -8,8 +8,8 @@ use rustc_ast::{ast, ptr};
 use rustc_span::Span;
 
 use crate::closures;
-use crate::config::lists::*;
 use crate::config::Version;
+use crate::config::{lists::*, Config};
 use crate::expr::{
     can_be_overflowed_expr, is_every_expr_simple, is_method_call, is_nested_call, is_simple_expr,
     rewrite_cond,
@@ -43,8 +43,7 @@ const SPECIAL_CASE_MACROS: &[(&str, usize)] = &[
     ("println!", 0),
     ("panic!", 0),
     ("unreachable!", 0),
-    // From the `log` crate.
-    ("trace!", 0),
+    // From the `log` crate. trace! is added for v2 - see `special_cases` below
     ("debug!", 0),
     ("error!", 0),
     ("info!", 0),
@@ -183,11 +182,17 @@ impl<'a> OverflowableItem<'a> {
         }
     }
 
-    fn special_cases(&self) -> &'static [(&'static str, usize)] {
+    fn special_cases(&self, config: &Config) -> Vec<(&'static str, usize)> {
         match self {
-            OverflowableItem::MacroArg(..) => SPECIAL_CASE_MACROS,
-            OverflowableItem::NestedMetaItem(..) => SPECIAL_CASE_ATTR,
-            _ => &[],
+            OverflowableItem::MacroArg(..) => {
+                let mut cases = SPECIAL_CASE_MACROS.to_vec();
+                if config.version() == Version::Two {
+                    cases.push(("trace!", 0));
+                }
+                cases
+            }
+            OverflowableItem::NestedMetaItem(..) => SPECIAL_CASE_ATTR.to_vec(),
+            _ => vec![],
         }
     }
 }
@@ -552,7 +557,7 @@ impl<'a> Context<'a> {
 
                     if tactic == DefinitiveListTactic::Vertical {
                         if let Some((all_simple, num_args_before)) =
-                            maybe_get_args_offset(self.ident, &self.items)
+                            maybe_get_args_offset(self.ident, &self.items, &self.context.config)
                         {
                             let one_line = all_simple
                                 && definitive_tactic(
@@ -772,12 +777,13 @@ fn no_long_items(list: &[ListItem], short_array_element_width_threshold: usize)
 pub(crate) fn maybe_get_args_offset(
     callee_str: &str,
     args: &[OverflowableItem<'_>],
+    config: &Config,
 ) -> Option<(bool, usize)> {
-    if let Some(&(_, num_args_before)) = args
+    if let Some((_, num_args_before)) = args
         .get(0)?
-        .special_cases()
-        .iter()
-        .find(|&&(s, _)| s == callee_str)
+        .special_cases(config)
+        .into_iter()
+        .find(|&(s, _)| s == callee_str)
     {
         let all_simple = args.len() > num_args_before
             && is_every_expr_simple(&args[0..num_args_before])

tests/source/issue-5987/two.rs

@@ -0,0 +1,13 @@
+// rustfmt-version: Two
+
+fn main() {
+    trace!(
+        "get some longer length in here yes yes {} {}",
+        "hello",
+        "world"
+    );
+    debug!(
+        "get some longer length in here yes yes {} {}",
+        "hello", "world"
+    );
+}

tests/source/macros.rs

@@ -270,10 +270,6 @@ fn special_case_macros() {
     debug!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
     debug!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26);
 
-    trace!("{}", 1);
-    trace!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-    trace!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26);
-
     error!("{}", 1);
     error!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
     error!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26);

tests/target/issue-5987/one.rs

@@ -0,0 +1,13 @@
+// rustfmt-version: One
+
+fn main() {
+    trace!(
+        "get some longer length in here yes yes {} {}",
+        "hello",
+        "world"
+    );
+    debug!(
+        "get some longer length in here yes yes {} {}",
+        "hello", "world"
+    );
+}

tests/target/issue-5987/two.rs

@@ -0,0 +1,12 @@
+// rustfmt-version: Two
+
+fn main() {
+    trace!(
+        "get some longer length in here yes yes {} {}",
+        "hello", "world"
+    );
+    debug!(
+        "get some longer length in here yes yes {} {}",
+        "hello", "world"
+    );
+}

tests/target/macros.rs

@@ -570,41 +570,6 @@ fn special_case_macros() {
         26
     );
 
-    trace!("{}", 1);
-    trace!(
-        "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-    );
-    trace!(
-        "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10,
-        11,
-        12,
-        13,
-        14,
-        15,
-        16,
-        17,
-        18,
-        19,
-        20,
-        21,
-        22,
-        23,
-        24,
-        25,
-        26
-    );
-
     error!("{}", 1);
     error!(
         "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",