about summary refs log tree commit diff
path: root/src/librustc_parse_format
diff options
context:
space:
mode:
authorkadmin <julianknodt@gmail.com>2020-08-27 02:18:38 +0000
committerkadmin <julianknodt@gmail.com>2020-08-27 03:29:06 +0000
commited9df28655607a17f01714b67930bdddba14fb26 (patch)
tree1a5c3ec640ba2fa6631ebb5b50bf00e7c3b3266a /src/librustc_parse_format
parent45a83e97ccc70a99794346eb60c11e209c67ecba (diff)
downloadrust-ed9df28655607a17f01714b67930bdddba14fb26.tar.gz
rust-ed9df28655607a17f01714b67930bdddba14fb26.zip
Fix ICE due to carriage return w/ multibyte char
Based off of
https://github.com/kfitch/rust/commit/972560b83f80e1219b5735ff3d751c034115b08e
Diffstat (limited to 'src/librustc_parse_format')
-rw-r--r--src/librustc_parse_format/lib.rs2
1 files changed, 1 insertions, 1 deletions
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();
                 }