From 1c7cd729a71aa80418b18f05ce5ef19894154fe0 Mon Sep 17 00:00:00 2001 From: Bram Geron Date: Mon, 24 Feb 2020 00:29:49 +0100 Subject: [PATCH 1/2] Nit: remove erroneous duplication --- src/tokens.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokens.md b/src/tokens.md index 3fda6cab7..ed099ce9d 100644 --- a/src/tokens.md +++ b/src/tokens.md @@ -154,8 +154,8 @@ Line-breaks are allowed in string literals. A line-break is either a newline (`U+000A`) or a pair of carriage return and newline (`U+000D`, `U+000A`). Both byte sequences are normally translated to `U+000A`, but as a special exception, when an unescaped `U+005C` character (`\`) occurs immediately before the -line-break, the `U+005C` character, the line-break, and all whitespace at the -beginning of the next line are ignored. Thus `a` and `b` are equal: +line-break, the `U+005C` character, and all whitespace at the beginning of the +next line are ignored. Thus `a` and `b` are equal: ```rust let a = "foobar"; From d69a6d13c917856aa7da839647dcdbde6d9dde46 Mon Sep 17 00:00:00 2001 From: Bram Geron Date: Mon, 23 Mar 2020 21:17:00 +0100 Subject: [PATCH 2/2] Undo regression, clarify instead (thanks @ehuss!) --- src/tokens.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokens.md b/src/tokens.md index ed099ce9d..0b0c29cf8 100644 --- a/src/tokens.md +++ b/src/tokens.md @@ -154,8 +154,8 @@ Line-breaks are allowed in string literals. A line-break is either a newline (`U+000A`) or a pair of carriage return and newline (`U+000D`, `U+000A`). Both byte sequences are normally translated to `U+000A`, but as a special exception, when an unescaped `U+005C` character (`\`) occurs immediately before the -line-break, the `U+005C` character, and all whitespace at the beginning of the -next line are ignored. Thus `a` and `b` are equal: +line-break, then the `U+005C` character, the line-break, and all whitespace at the +beginning of the next line are ignored. Thus `a` and `b` are equal: ```rust let a = "foobar";