language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Split string lexing and run rustfmt

Browse source
This commit is contained in:
Adolfo Ochagavía 2018-11-11 21:00:31 +01:00
parent 30cd4d5acb
commit c96bfe7e2d
10 changed files with 548 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_syntax/src/validation/byte.rs
View file

@ -48,7 +48,10 @@ pub(super) fn validate_byte_component(
AsciiCodeEscape => validate_byte_code_escape(text, range, errors),
UnicodeEscape => errors.push(SyntaxError::new(UnicodeEscapeForbidden, range)),
CodePoint => {
let c = text.chars().next().expect("Code points should be one character long");
let c = text
.chars()
.next()
.expect("Code points should be one character long");
// These bytes must always be escaped
if c == '\t' || c == '\r' || c == '\n' {
@ -148,9 +151,7 @@ mod test {
#[test]
fn test_valid_byte_escape() {
let valid = [
r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0",
];
let valid = [r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0"];
for c in &valid {
assert_valid_byte(c);
}

4
crates/ra_syntax/src/validation/char.rs
View file

@ -213,9 +213,7 @@ mod test {
#[test]
fn test_valid_ascii_escape() {
let valid = [
r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0",
];
let valid = [r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0"];
for c in &valid {
assert_valid_char(c);
}