Apply short function call heuristic to attributes

Closes #2620

Author: nrc

src/attr.rs

@@ -98,6 +98,7 @@ fn format_derive(
         argument_shape,
         // 10 = "[derive()]", 3 = "()" and "]"
         shape.offset_left(10 + prefix.len())?.sub_width(3)?,
+        None,
     )?;
 
     result.push_str(&item_str);
@@ -227,6 +228,7 @@ impl Rewrite for ast::MetaItem {
                     shape
                         .offset_left(path.len())?
                         .sub_width(3 + trailing_comma.len())?,
+                    Some(context.config.width_heuristics().fn_call_width),
                 )?;
 
                 let indent = if item_str.starts_with('\n') {
@@ -264,6 +266,7 @@ fn format_arg_list<I, T, F1, F2, F3>(
     context: &RewriteContext,
     shape: Shape,
     one_line_shape: Shape,
+    one_line_limit: Option<usize>,
 ) -> Option<String>
 where
     I: Iterator<Item = T>,
@@ -284,12 +287,14 @@ where
         false,
     );
     let item_vec = items.collect::<Vec<_>>();
-    let tactic = ::lists::definitive_tactic(
-        &item_vec,
-        ListTactic::HorizontalVertical,
-        ::lists::Separator::Comma,
-        shape.width,
-    );
+    let tactic = if let Some(limit) = one_line_limit {
+        ListTactic::LimitedHorizontalVertical(limit)
+    } else {
+        ListTactic::HorizontalVertical
+    };
+
+    let tactic =
+        ::lists::definitive_tactic(&item_vec, tactic, ::lists::Separator::Comma, shape.width);
     let fmt = ListFormatting {
         tactic,
         separator: ",",

tests/source/attrib.rs

@@ -174,3 +174,22 @@ pub fn foo() {}
 #[clippy::bar(a, b, c)]
 pub fn foo() {}
 
+mod issue_2620 {
+    #[derive(Debug, StructOpt)]
+#[structopt(about = "Display information about the character on FF Logs")]
+pub struct Params {
+  #[structopt(help = "The server the character is on")]
+  server: String,
+  #[structopt(help = "The character's first name")]
+  first_name: String,
+  #[structopt(help = "The character's last name")]
+  last_name: String,
+  #[structopt(
+    short = "j",
+    long = "job",
+    help = "The job to look at",
+    parse(try_from_str)
+  )]
+  job: Option<Job>
+}
+}

tests/target/attrib.rs

@@ -76,7 +76,14 @@ struct Foo {
 // #1668
 
 /// Default path (*nix)
-#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))]
+#[cfg(
+    all(
+        unix,
+        not(target_os = "macos"),
+        not(target_os = "ios"),
+        not(target_os = "android")
+    )
+)]
 fn foo() {
     #[cfg(target_os = "freertos")]
     match port_id {
@@ -197,3 +204,23 @@ pub fn foo() {}
 #[clippy::bar=foo]
 #[clippy::bar(a, b, c)]
 pub fn foo() {}
+
+mod issue_2620 {
+    #[derive(Debug, StructOpt)]
+    #[structopt(about = "Display information about the character on FF Logs")]
+    pub struct Params {
+        #[structopt(help = "The server the character is on")]
+        server: String,
+        #[structopt(help = "The character's first name")]
+        first_name: String,
+        #[structopt(help = "The character's last name")]
+        last_name: String,
+        #[structopt(
+            short = "j",
+            long = "job",
+            help = "The job to look at",
+            parse(try_from_str)
+        )]
+        job: Option<Job>,
+    }
+}

tests/target/enum.rs

@@ -255,7 +255,12 @@ pub enum QlError {
     #[fail(display = "Translation error: from {} to {}", 0, 1)]
     TranslationError(String, String),
     // (kind, input, expected)
-    #[fail(display = "Could not find {}: Found: {}, expected: {:?}", 0, 1, 2)]
+    #[fail(
+        display = "Could not find {}: Found: {}, expected: {:?}",
+        0,
+        1,
+        2
+    )]
     ResolveError(&'static str, String, Option<String>),
 }
 

tests/target/struct-field-attributes.rs

@@ -39,13 +39,19 @@ fn new_foo() -> Foo {
 // #2044
 pub enum State {
     Closure(
-        #[cfg_attr(feature = "serde_derive", serde(state_with = "::serialization::closure"))]
+        #[cfg_attr(
+            feature = "serde_derive",
+            serde(state_with = "::serialization::closure")
+        )]
         GcPtr<ClosureData>,
     ),
 }
 
 struct Fields(
-    #[cfg_attr(feature = "serde_derive", serde(state_with = "::base::serialization::shared"))]
+    #[cfg_attr(
+        feature = "serde_derive",
+        serde(state_with = "::base::serialization::shared")
+    )]
     Arc<Vec<InternedStr>>,
 );