Merge #1093

1093: simplify r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

4 files changed, 4 insertions, 4 deletions

diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs
index 290f80fc6..f653e65d0 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -12,7 +12,7 @@ use crate::{
 pub(super) fn validate_byte_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
     let literal_range = node.range();
-    let mut components = string_lexing::parse_byte_literal(literal_text);
+    let mut components = string_lexing::parse_quoted_literal(Some('b'), '\'', literal_text);
     let mut len = 0;
     for component in &mut components {
         len += 1;
diff --git a/crates/ra_syntax/src/validation/byte_string.rs b/crates/ra_syntax/src/validation/byte_string.rs
index eae395e9d..1d48c2d9b 100644
--- a/crates/ra_syntax/src/validation/byte_string.rs
+++ b/crates/ra_syntax/src/validation/byte_string.rs
@@ -10,7 +10,7 @@ use super::byte;
 pub(crate) fn validate_byte_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
     let literal_range = node.range();
-    let mut components = string_lexing::parse_byte_string_literal(literal_text);
+    let mut components = string_lexing::parse_quoted_literal(Some('b'), '"', literal_text);
     for component in &mut components {
         let range = component.range + literal_range.start();
 
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs
index a385accdd..0f1885873 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -15,7 +15,7 @@ use crate::{
 pub(super) fn validate_char_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
     let literal_range = node.range();
-    let mut components = string_lexing::parse_char_literal(literal_text);
+    let mut components = string_lexing::parse_quoted_literal(None, '\'', literal_text);
     let mut len = 0;
     for component in &mut components {
         len += 1;
diff --git a/crates/ra_syntax/src/validation/string.rs b/crates/ra_syntax/src/validation/string.rs
index f7f5c02c0..fc2f1b992 100644
--- a/crates/ra_syntax/src/validation/string.rs
+++ b/crates/ra_syntax/src/validation/string.rs
@@ -10,7 +10,7 @@ use super::char;
 pub(crate) fn validate_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
     let literal_range = node.range();
-    let mut components = string_lexing::parse_string_literal(literal_text);
+    let mut components = string_lexing::parse_quoted_literal(None, '"', literal_text);
     for component in &mut components {
         let range = component.range + literal_range.start();