bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Properly escape quotes when suggesting switching between char/string literals

Browse source
This commit is contained in:
clubby789 2022-10-22 02:37:15 +01:00
parent 0940040c04
commit ed40d46159
2 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_parse/src/lexer/unescape_error_reporting.rs
View file

@ -113,11 +113,26 @@ pub(crate) fn emit_unescape_error(
} else {
("", "if you meant to write a `str` literal, use double quotes")
};
let mut escaped = String::with_capacity(lit.len());
let mut chrs = lit.chars().peekable();
while let Some(first) = chrs.next() {
match (first, chrs.peek()) {
('\\', Some('"')) => {
escaped.push('\\');
escaped.push('"');
chrs.next();
}
('"', _) => {
escaped.push('\\');
escaped.push('"')
}
(c, _) => escaped.push(c),
};
}
handler.span_suggestion(
span_with_quotes,
msg,
format!("{}\"{}\"", prefix, lit),
format!("{prefix}\"{escaped}\""),
Applicability::MachineApplicable,
);
}