about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDevon Hollowood <devonhollowood@gmail.com>2018-10-07 17:08:20 -0700
committerDevon Hollowood <devonhollowood@gmail.com>2018-10-07 17:09:32 -0700
commit82638e4dd42274dd1c644197b9dc821aa3409c97 (patch)
treeda71ade49b13cabd6be35337a28731c1b7c35a7b
parentbe983fbf52c581bfa51e8b5dd95fb9f599a67639 (diff)
downloadrust-82638e4dd42274dd1c644197b9dc821aa3409c97.tar.gz
rust-82638e4dd42274dd1c644197b9dc821aa3409c97.zip
Fix items_after_statements for `const`s
-rw-r--r--clippy_lints/src/write.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs
index 06575a264b3..1fa7c50bb9b 100644
--- a/clippy_lints/src/write.rs
+++ b/clippy_lints/src/write.rs
@@ -283,13 +283,6 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &ThinTokenStream, is_write: bool) -
     let lint = if is_write { WRITE_LITERAL } else { PRINT_LITERAL };
     let mut idx = 0;
     loop {
-        if !parser.eat(&token::Comma) {
-            return (Some(fmtstr), expr);
-        }
-        let token_expr = match parser.parse_expr().map_err(|mut err| err.cancel()) {
-            Ok(expr) => expr,
-            Err(_) => return (Some(fmtstr), None),
-        };
         const SIMPLE: FormatSpec<'_> = FormatSpec {
             fill: None,
             align: AlignUnknown,
@@ -298,6 +291,13 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &ThinTokenStream, is_write: bool) -
             width: CountImplied,
             ty: "",
         };
+        if !parser.eat(&token::Comma) {
+            return (Some(fmtstr), expr);
+        }
+        let token_expr = match parser.parse_expr().map_err(|mut err| err.cancel()) {
+            Ok(expr) => expr,
+            Err(_) => return (Some(fmtstr), None),
+        };
         match &token_expr.node {
             ExprKind::Lit(_) => {
                 let mut all_simple = true;