diff options
| author | Aleksey Kladov <[email protected]> | 2019-04-02 16:18:00 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2019-04-02 17:15:13 +0100 |
| commit | cf1caf518122b84b9516e1b9f65ba778f1900bf3 (patch) | |
| tree | a0f814c651b12b55e54fe01a2621d6527f285db2 /crates/ra_syntax/src/validation | |
| parent | 0a758a2c4803c7ecc956d2aa6ed2ce48c4e4edd9 (diff) | |
simplify
Diffstat (limited to 'crates/ra_syntax/src/validation')
| -rw-r--r-- | crates/ra_syntax/src/validation/byte.rs | 2 | ||||
| -rw-r--r-- | crates/ra_syntax/src/validation/byte_string.rs | 2 | ||||
| -rw-r--r-- | crates/ra_syntax/src/validation/char.rs | 2 | ||||
| -rw-r--r-- | crates/ra_syntax/src/validation/string.rs | 2 |
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::{ | |||
| 12 | pub(super) fn validate_byte_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { | 12 | pub(super) fn validate_byte_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { |
| 13 | let literal_text = node.text(); | 13 | let literal_text = node.text(); |
| 14 | let literal_range = node.range(); | 14 | let literal_range = node.range(); |
| 15 | let mut components = string_lexing::parse_byte_literal(literal_text); | 15 | let mut components = string_lexing::parse_quoted_literal(Some('b'), '\'', literal_text); |
| 16 | let mut len = 0; | 16 | let mut len = 0; |
| 17 | for component in &mut components { | 17 | for component in &mut components { |
| 18 | len += 1; | 18 | 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; | |||
| 10 | pub(crate) fn validate_byte_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { | 10 | pub(crate) fn validate_byte_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { |
| 11 | let literal_text = node.text(); | 11 | let literal_text = node.text(); |
| 12 | let literal_range = node.range(); | 12 | let literal_range = node.range(); |
| 13 | let mut components = string_lexing::parse_byte_string_literal(literal_text); | 13 | let mut components = string_lexing::parse_quoted_literal(Some('b'), '"', literal_text); |
| 14 | for component in &mut components { | 14 | for component in &mut components { |
| 15 | let range = component.range + literal_range.start(); | 15 | let range = component.range + literal_range.start(); |
| 16 | 16 | ||
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::{ | |||
| 15 | pub(super) fn validate_char_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { | 15 | pub(super) fn validate_char_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { |
| 16 | let literal_text = node.text(); | 16 | let literal_text = node.text(); |
| 17 | let literal_range = node.range(); | 17 | let literal_range = node.range(); |
| 18 | let mut components = string_lexing::parse_char_literal(literal_text); | 18 | let mut components = string_lexing::parse_quoted_literal(None, '\'', literal_text); |
| 19 | let mut len = 0; | 19 | let mut len = 0; |
| 20 | for component in &mut components { | 20 | for component in &mut components { |
| 21 | len += 1; | 21 | 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; | |||
| 10 | pub(crate) fn validate_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { | 10 | pub(crate) fn validate_string_node(node: SyntaxToken, errors: &mut Vec<SyntaxError>) { |
| 11 | let literal_text = node.text(); | 11 | let literal_text = node.text(); |
| 12 | let literal_range = node.range(); | 12 | let literal_range = node.range(); |
| 13 | let mut components = string_lexing::parse_string_literal(literal_text); | 13 | let mut components = string_lexing::parse_quoted_literal(None, '"', literal_text); |
| 14 | for component in &mut components { | 14 | for component in &mut components { |
| 15 | let range = component.range + literal_range.start(); | 15 | let range = component.range + literal_range.start(); |
| 16 | 16 | ||