Merge pull request #2527 from topecongiro/issue-2526

Check whether '\\'' is char literal or lifetime

Author: nrc

Cargo.lock

@@ -32,6 +32,7 @@ cargo-fmt = []
 rustfmt-format-diff = []
 
 [dependencies]
+itertools = "0.7"
 toml = "0.4"
 serde = "1.0"
 serde_derive = "1.0"

Cargo.toml

@@ -12,6 +12,7 @@
 
 use std::{self, iter, borrow::Cow};
 
+use itertools::{multipeek, MultiPeek};
 use syntax::codemap::Span;
 
 use config::Config;
@@ -693,7 +694,7 @@ where
     T: Iterator,
     T::Item: RichChar,
 {
-    base: iter::Peekable<T>,
+    base: MultiPeek<T>,
     status: CharClassesStatus,
 }
 
@@ -785,7 +786,7 @@ where
 {
     pub fn new(base: T) -> CharClasses<T> {
         CharClasses {
-            base: base.peekable(),
+            base: multipeek(base),
             status: CharClassesStatus::Normal,
         }
     }
@@ -829,7 +830,21 @@ where
                     char_kind = FullCodeCharKind::InString;
                     CharClassesStatus::LitString
                 }
-                '\'' => CharClassesStatus::LitChar,
+                '\'' => {
+                    // HACK: Work around mut borrow.
+                    match self.base.peek() {
+                        Some(next) if next.get_char() == '\\' => {
+                            self.status = CharClassesStatus::LitChar;
+                            return Some((char_kind, item));
+                        }
+                        _ => (),
+                    }
+
+                    match self.base.peek() {
+                        Some(next) if next.get_char() == '\'' => CharClassesStatus::LitChar,
+                        _ => CharClassesStatus::Normal,
+                    }
+                }
                 '/' => match self.base.peek() {
                     Some(next) if next.get_char() == '*' => {
                         self.status = CharClassesStatus::BlockCommentOpening(1);

src/comment.rs

@@ -16,6 +16,7 @@
 #[macro_use]
 extern crate derive_new;
 extern crate diff;
+extern crate itertools;
 #[macro_use]
 extern crate log;
 extern crate regex;

src/lib.rs

@@ -0,0 +1,8 @@
+// Test that rustfmt will not warn about comments exceeding max width around lifetime.
+// See #2526.
+
+// comment comment comment comment comment comment comment comment comment comment comment comment comment
+fn foo() -> F<'a> {
+    bar()
+}
+// comment comment comment comment comment comment comment comment comment comment comment comment comment