From: Masaki Hara <ackie.h.gmai@gmail.com>
Date: Sun, 14 May 2017 12:37:50 +0000 (+0900)
Subject: Disallow underscore suffix for string-like literals.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=ed6c6c9a11f7deddbd1f209c5e7de12bc420c550;p=rust.git

Disallow underscore suffix for string-like literals.
---

diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index a83b19c7334..480049f845c 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -479,11 +479,7 @@ fn scan_optional_raw_name(&mut self) -> Option<ast::Name> {
         }
 
         self.with_str_from(start, |string| {
-            if string == "_" {
-                None
-            } else {
-                Some(Symbol::intern(string))
-            }
+            Some(Symbol::intern(string))
         })
     }
 
diff --git a/src/test/parse-fail/underscore-suffix-for-string.rs b/src/test/parse-fail/underscore-suffix-for-string.rs
new file mode 100644
index 00000000000..a19bbe08377
--- /dev/null
+++ b/src/test/parse-fail/underscore-suffix-for-string.rs
@@ -0,0 +1,13 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let a = "Foo"_; //~ ERROR string literal with a suffix is invalid
+}