From ed9df28655607a17f01714b67930bdddba14fb26 Mon Sep 17 00:00:00 2001
From: kadmin <julianknodt@gmail.com>
Date: Thu, 27 Aug 2020 02:18:38 +0000
Subject: [PATCH] Fix ICE due to carriage return w/ multibyte char

Based off of
https://github.com/kfitch/rust/commit/972560b83f80e1219b5735ff3d751c034115b08e
---
 src/librustc_parse_format/lib.rs      | 2 +-
 src/test/ui/issues/issue-70381.rs     | 6 ++++++
 src/test/ui/issues/issue-70381.stderr | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/issues/issue-70381.rs
 create mode 100644 src/test/ui/issues/issue-70381.stderr

diff --git a/src/librustc_parse_format/lib.rs b/src/librustc_parse_format/lib.rs
index ebb3aa3866e..e07b8b86aef 100644
--- a/src/librustc_parse_format/lib.rs
+++ b/src/librustc_parse_format/lib.rs
@@ -760,7 +760,7 @@ fn find_skips_from_snippet(
                 (' ' | '\n' | '\t', _) if eat_ws => {
                     skips.push(pos);
                 }
-                ('\\', Some((next_pos, 'n' | 't' | '0' | '\\' | '\'' | '\"'))) => {
+                ('\\', Some((next_pos, 'n' | 't' | 'r' | '0' | '\\' | '\'' | '\"'))) => {
                     skips.push(*next_pos);
                     let _ = s.next();
                 }
diff --git a/src/test/ui/issues/issue-70381.rs b/src/test/ui/issues/issue-70381.rs
new file mode 100644
index 00000000000..3df8277b873
--- /dev/null
+++ b/src/test/ui/issues/issue-70381.rs
@@ -0,0 +1,6 @@
+// Test that multi-byte unicode characters with missing parameters do not ICE.
+
+fn main() {
+  println!("\r¡{}")
+  //~^ ERROR 1 positional argument in format string
+}
diff --git a/src/test/ui/issues/issue-70381.stderr b/src/test/ui/issues/issue-70381.stderr
new file mode 100644
index 00000000000..96b8e656991
--- /dev/null
+++ b/src/test/ui/issues/issue-70381.stderr
@@ -0,0 +1,8 @@
+error: 1 positional argument in format string, but no arguments were given
+  --> $DIR/issue-70381.rs:4:16
+   |
+LL |   println!("\r¡{}")
+   |                ^^
+
+error: aborting due to previous error
+