nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove parse::escape_default().

Browse Source 
str::escape_default() can be used instead.
This commit is contained in:
Nicholas Nethercote 2018-05-03 08:55:58 +10:00
parent d5d389e4f1
commit 7a56360ece
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/parse/mod.rs
View File

@ -298,14 +298,10 @@ pub fn char_lit(lit: &str, diag: Option<(Span, &Handler)>) -> (char, isize) {
} }
} }
pub fn escape_default(s: &str) -> String {
s.chars().map(char::escape_default).flat_map(|x| x).collect()
}
/// Parse a string representing a string literal into its final form. Does /// Parse a string representing a string literal into its final form. Does
/// unescaping. /// unescaping.
pub fn str_lit(lit: &str, diag: Option<(Span, &Handler)>) -> String { pub fn str_lit(lit: &str, diag: Option<(Span, &Handler)>) -> String {
debug!("parse_str_lit: given {}", escape_default(lit)); debug!("str_lit: given {}", lit.escape_default());
let mut res = String::with_capacity(lit.len()); let mut res = String::with_capacity(lit.len());
let error = |i| format!("lexer should have rejected {} at {}", lit, i); let error = |i| format!("lexer should have rejected {} at {}", lit, i);
@ -374,7 +370,7 @@ pub fn str_lit(lit: &str, diag: Option<(Span, &Handler)>) -> String {
/// Parse a string representing a raw string literal into its final form. The /// Parse a string representing a raw string literal into its final form. The
/// only operation this does is convert embedded CRLF into a single LF. /// only operation this does is convert embedded CRLF into a single LF.
pub fn raw_str_lit(lit: &str) -> String { pub fn raw_str_lit(lit: &str) -> String {
debug!("raw_str_lit: given {}", escape_default(lit)); debug!("raw_str_lit: given {}", lit.escape_default());
let mut res = String::with_capacity(lit.len()); let mut res = String::with_capacity(lit.len());
let mut chars = lit.chars().peekable(); let mut chars = lit.chars().peekable();

2
src/libsyntax/print/pprust.rs
View File

@ -656,7 +656,7 @@ pub trait PrintState<'a> {
style: ast::StrStyle) -> io::Result<()> { style: ast::StrStyle) -> io::Result<()> {
let st = match style { let st = match style {
ast::StrStyle::Cooked => { ast::StrStyle::Cooked => {
(format!("\"{}\"", parse::escape_default(st))) (format!("\"{}\"", st.escape_default()))
} }
ast::StrStyle::Raw(n) => { ast::StrStyle::Raw(n) => {
(format!("r{delim}\"{string}\"{delim}", (format!("r{delim}\"{string}\"{delim}",