From 9e213385c9d06db3c8ca20812779e2b8f8ad2c71 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 30 Mar 2019 13:25:53 +0300 Subject: switch to new rowan --- crates/ra_syntax/src/validation/byte.rs | 6 +++--- crates/ra_syntax/src/validation/byte_string.rs | 6 +++--- crates/ra_syntax/src/validation/char.rs | 6 +++--- crates/ra_syntax/src/validation/string.rs | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'crates/ra_syntax/src/validation') diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs index 838e7a65f..290f80fc6 100644 --- a/crates/ra_syntax/src/validation/byte.rs +++ b/crates/ra_syntax/src/validation/byte.rs @@ -1,17 +1,17 @@ //! 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) { +pub(super) fn validate_byte_node(node: SyntaxToken, errors: &mut Vec) { let literal_text = node.text(); - let literal_range = node.syntax().range(); + let literal_range = node.range(); let mut components = string_lexing::parse_byte_literal(literal_text); let mut len = 0; for component in &mut components { diff --git a/crates/ra_syntax/src/validation/byte_string.rs b/crates/ra_syntax/src/validation/byte_string.rs index 64c7054a1..eae395e9d 100644 --- a/crates/ra_syntax/src/validation/byte_string.rs +++ b/crates/ra_syntax/src/validation/byte_string.rs @@ -1,15 +1,15 @@ 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) { +pub(crate) fn validate_byte_string_node(node: SyntaxToken, errors: &mut Vec) { let literal_text = node.text(); - let literal_range = node.syntax().range(); + let literal_range = node.range(); let mut components = string_lexing::parse_byte_string_literal(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..a385accdd 100644 --- a/crates/ra_syntax/src/validation/char.rs +++ b/crates/ra_syntax/src/validation/char.rs @@ -5,16 +5,16 @@ 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) { +pub(super) fn validate_char_node(node: SyntaxToken, errors: &mut Vec) { let literal_text = node.text(); - let literal_range = node.syntax().range(); + let literal_range = node.range(); let mut components = string_lexing::parse_char_literal(literal_text); let mut len = 0; for component in &mut components { diff --git a/crates/ra_syntax/src/validation/string.rs b/crates/ra_syntax/src/validation/string.rs index d857d088c..f7f5c02c0 100644 --- a/crates/ra_syntax/src/validation/string.rs +++ b/crates/ra_syntax/src/validation/string.rs @@ -1,15 +1,15 @@ 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) { +pub(crate) fn validate_string_node(node: SyntaxToken, errors: &mut Vec) { let literal_text = node.text(); - let literal_range = node.syntax().range(); + let literal_range = node.range(); let mut components = string_lexing::parse_string_literal(literal_text); for component in &mut components { let range = component.range + literal_range.start(); -- cgit v1.2.3