From eb42956e84cd284abc7ee4c28c562daf3d408293 Mon Sep 17 00:00:00 2001
From: David Alber <alber.david@gmail.com>
Date: Tue, 5 Dec 2017 16:49:48 -0800
Subject: [PATCH] Adding `print!` specially-formatted `format!`-like macros
 list

This commit corrects what appears to be an accidental inclusion of
`panic!` twice in the list resulting from the union of ffbe52e and
aeb3398.
---
 src/expr.rs            |  2 +-
 tests/source/macros.rs |  4 ++++
 tests/target/macros.rs | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/expr.rs b/src/expr.rs
index db256c3ba7de..a94f51bb8116 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1818,7 +1818,7 @@ const FORMAT_LIKE_WHITELIST: &[&str] = &[
     "eprintln!",
     "format!",
     "format_args!",
-    "panic!",
+    "print!",
     "println!",
     "unreachable!",
     // From the `log` crate.
diff --git a/tests/source/macros.rs b/tests/source/macros.rs
index 8f4bd75fe2b9..f1df8b9b876b 100644
--- a/tests/source/macros.rs
+++ b/tests/source/macros.rs
@@ -234,6 +234,10 @@ fn special_case_macros() {
     let r = format_args!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
     let s = format_args!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 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);
 
+    let q = print!("{}", 1);
+    let r = print!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+    let s = print!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 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);
+
     let q = println!("{}", 1);
     let r = println!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
     let s = println!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}", 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);
diff --git a/tests/target/macros.rs b/tests/target/macros.rs
index 47dad382e0af..a242235833c4 100644
--- a/tests/target/macros.rs
+++ b/tests/target/macros.rs
@@ -411,6 +411,41 @@ fn special_case_macros() {
         26
     );
 
+    let q = print!("{}", 1);
+    let r = print!(
+        "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+    );
+    let s = print!(
+        "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
+        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
+    );
+
     let q = println!("{}", 1);
     let r = println!(
         "{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",