4 files changed, 16 insertions, 16 deletions

diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs
index 838e7a65f..f653e65d0 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -1,18 +1,18 @@
 //! Validation of byte literals
 
 use crate::{
-    ast::{self, AstNode, AstToken},
     string_lexing::{self, StringComponentKind},
     TextRange,
     validation::char,
     SyntaxError,
     SyntaxErrorKind::*,
+    SyntaxToken,
 };
 
-pub(super) fn validate_byte_node(node: &ast::Byte, errors: &mut Vec<SyntaxError>) {
+pub(super) fn validate_byte_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
-    let literal_range = node.syntax().range();
-    let mut components = string_lexing::parse_byte_literal(literal_text);
+    let literal_range = node.range();
+    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 64c7054a1..1d48c2d9b 100644
--- a/crates/ra_syntax/src/validation/byte_string.rs
+++ b/crates/ra_syntax/src/validation/byte_string.rs
@@ -1,16 +1,16 @@
 use crate::{
-    ast::{self, AstNode, AstToken},
     string_lexing::{self, StringComponentKind},
     SyntaxError,
     SyntaxErrorKind::*,
+    SyntaxToken,
 };
 
 use super::byte;
 
-pub(crate) fn validate_byte_string_node(node: &ast::ByteString, errors: &mut Vec<SyntaxError>) {
+pub(crate) fn validate_byte_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
-    let literal_range = node.syntax().range();
-    let mut components = string_lexing::parse_byte_string_literal(literal_text);
+    let literal_range = node.range();
+    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 c874e5d08..0f1885873 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -5,17 +5,17 @@ use std::u32;
 use arrayvec::ArrayString;
 
 use crate::{
-    ast::{self, AstNode, AstToken},
     string_lexing::{self, StringComponentKind},
     TextRange,
     SyntaxError,
     SyntaxErrorKind::*,
+    SyntaxToken,
 };
 
-pub(super) fn validate_char_node(node: &ast::Char, errors: &mut Vec<SyntaxError>) {
+pub(super) fn validate_char_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
-    let literal_range = node.syntax().range();
-    let mut components = string_lexing::parse_char_literal(literal_text);
+    let literal_range = node.range();
+    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 d857d088c..fc2f1b992 100644
--- a/crates/ra_syntax/src/validation/string.rs
+++ b/crates/ra_syntax/src/validation/string.rs
@@ -1,16 +1,16 @@
 use crate::{
-    ast::{self, AstNode, AstToken},
     string_lexing,
     SyntaxError,
     SyntaxErrorKind::*,
+    SyntaxToken,
 };
 
 use super::char;
 
-pub(crate) fn validate_string_node(node: &ast::String, errors: &mut Vec<SyntaxError>) {
+pub(crate) fn validate_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) {
     let literal_text = node.text();
-    let literal_range = node.syntax().range();
-    let mut components = string_lexing::parse_string_literal(literal_text);
+    let literal_range = node.range();
+    let mut components = string_lexing::parse_quoted_literal(None, '"', literal_text);
     for component in &mut components {
         let range = component.range + literal_range.start();