-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disallow char literals which should be escaped
As documented in issue #7945, these literal identifiers are all accepted by rust today, but they should probably be disallowed (especially `'''`). This changes all escapable sequences to being *required* to be escaped. Closes #7945
- Loading branch information
1 parent
89cc852
commit 2661b63
Showing
5 changed files
with
89 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright 2013 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() { | ||
// these literals are just silly. | ||
'''; | ||
//~^ ERROR: character constant must be escaped | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// Copyright 2013 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() { | ||
// note that this is a literal "\n" byte | ||
' | ||
'; | ||
//~^^ ERROR: character constant must be escaped | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright 2013 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() { | ||
// note that this is a literal tab character here | ||
' '; | ||
//~^ ERROR: character constant must be escaped | ||
} |
2661b63
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from thestinger
at alexcrichton@2661b63
2661b63
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging alexcrichton/rust/issue-7945 = 2661b63 into auto
2661b63
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
alexcrichton/rust/issue-7945 = 2661b63 merged ok, testing candidate = 512f778
2661b63
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1665
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1668
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/774
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/774
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1683
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/774
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/774
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1683
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/774
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/775
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/855
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1668
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/774
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/775
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1452
2661b63
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 512f778