Merge pull request #2809 from nrc/formatting

Some formatting fixes

Author: topecongiro

src/attr.rs

@@ -533,7 +533,7 @@ where
             let pre_snippet = self
                 .snippet_provider
                 .span_to_snippet(mk_sp(self.prev_span_end, (self.get_lo)(&item)))
-                .unwrap();
+                .unwrap_or("");
             let trimmed_pre_snippet = pre_snippet.trim();
             let has_single_line_comment = trimmed_pre_snippet.starts_with("//");
             let has_block_comment = trimmed_pre_snippet.starts_with("/*");
@@ -572,7 +572,7 @@ where
             let post_snippet = self
                 .snippet_provider
                 .span_to_snippet(mk_sp((self.get_hi)(&item), next_start))
-                .unwrap();
+                .unwrap_or("");
 
             let comment_end = match self.inner.peek() {
                 Some(..) => {

src/lists.rs

@@ -289,7 +289,13 @@ fn rewrite_match_pattern(
     let pats_str = rewrite_multiple_patterns(context, pats, pat_shape)?;
 
     // Guard
-    let guard_str = rewrite_guard(context, guard, shape, trimmed_last_line_width(&pats_str))?;
+    let guard_str = rewrite_guard(
+        context,
+        guard,
+        shape,
+        trimmed_last_line_width(&pats_str),
+        pats_str.contains("\n"),
+    )?;
 
     Some(format!("{}{}", pats_str, guard_str))
 }
@@ -450,17 +456,20 @@ fn rewrite_guard(
     // The amount of space used up on this line for the pattern in
     // the arm (excludes offset).
     pattern_width: usize,
+    multiline_pattern: bool,
 ) -> Option<String> {
     if let Some(ref guard) = *guard {
         // First try to fit the guard string on the same line as the pattern.
         // 4 = ` if `, 5 = ` => {`
         let cond_shape = shape
             .offset_left(pattern_width + 4)
             .and_then(|s| s.sub_width(5));
-        if let Some(cond_shape) = cond_shape {
-            if let Some(cond_str) = guard.rewrite(context, cond_shape) {
-                if !cond_str.contains('\n') || pattern_width <= context.config.tab_spaces() {
-                    return Some(format!(" if {}", cond_str));
+        if !multiline_pattern {
+            if let Some(cond_shape) = cond_shape {
+                if let Some(cond_str) = guard.rewrite(context, cond_shape) {
+                    if !cond_str.contains('\n') || pattern_width <= context.config.tab_spaces() {
+                        return Some(format!(" if {}", cond_str));
+                    }
                 }
             }
         }

src/matches.rs

@@ -27,6 +27,7 @@ pub struct Indent {
 const INDENT_BUFFER_LEN: usize = 80;
 const INDENT_BUFFER: &str =
     "\n                                                                                ";
+
 impl Indent {
     pub fn new(block_indent: usize, alignment: usize) -> Indent {
         Indent {

src/shape.rs

@@ -151,7 +151,13 @@ fn attributes_on_statements() {
     foo!();
 }
 
-// Large derive
+// Large derives
+#[derive(Add, Sub, Mul, Div, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize, Mul)]
+
+
+/// Foo bar baz
+
+
 #[derive(Add, Sub, Mul, Div, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize, Deserialize)]
 pub struct HP(pub u8);
 
@@ -168,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/source/attrib.rs

@@ -491,3 +491,19 @@ fn issue_2621() {
         | Foo::I => println!("With comment"), // Comment after line
     }
 }
+
+fn issue_2377() {
+    match tok {
+        Tok::Not
+        | Tok::BNot
+        | Tok::Plus
+        | Tok::Minus
+        | Tok::PlusPlus
+        | Tok::MinusMinus
+        | Tok::Void
+        | Tok::Delete if prec <= 16 => {
+            // code here...
+        }
+        Tok::TypeOf if prec <= 16 => {}
+    }
+}

tests/source/match.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 {
@@ -155,9 +162,29 @@ fn attributes_on_statements() {
     foo!();
 }
 
-// Large derive
-#[derive(Add, Sub, Mul, Div, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize,
-         Deserialize)]
+// Large derives
+#[derive(
+    Add, Sub, Mul, Div, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug, Hash, Serialize, Mul,
+)]
+
+/// Foo bar baz
+
+#[derive(
+    Add,
+    Sub,
+    Mul,
+    Div,
+    Clone,
+    Copy,
+    Eq,
+    PartialEq,
+    Ord,
+    PartialOrd,
+    Debug,
+    Hash,
+    Serialize,
+    Deserialize,
+)]
 pub struct HP(pub u8);
 
 // Long `#[doc = "..."]`
@@ -177,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/attrib.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/enum.rs

@@ -518,3 +518,21 @@ fn issue_2621() {
         Foo::I => println!("With comment"), // Comment after line
     }
 }
+
+fn issue_2377() {
+    match tok {
+        Tok::Not
+        | Tok::BNot
+        | Tok::Plus
+        | Tok::Minus
+        | Tok::PlusPlus
+        | Tok::MinusMinus
+        | Tok::Void
+        | Tok::Delete
+            if prec <= 16 =>
+        {
+            // code here...
+        }
+        Tok::TypeOf if prec <= 16 => {}
+    }
+}

tests/target/match.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>>,
 );