Merge #449

449: switch to new rowan API r=matklad a=matklad

closes https://github.com/rust-analyzer/rust-analyzer/issues/448

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

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 714224b09..4deb302a7 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -11,7 +11,7 @@ use crate::{
     },
 };
 
-pub(super) fn validate_byte_node(node: ast::Byte, errors: &mut Vec<SyntaxError>) {
+pub(super) fn validate_byte_node(node: &ast::Byte, 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);
@@ -106,11 +106,11 @@ fn validate_byte_code_escape(text: &str, range: TextRange, errors: &mut Vec<Synt
 
 #[cfg(test)]
 mod test {
-    use crate::SourceFileNode;
+    use crate::{SourceFile, TreePtr};
 
-    fn build_file(literal: &str) -> SourceFileNode {
+    fn build_file(literal: &str) -> TreePtr<SourceFile> {
         let src = format!("const C: u8 = b'{}';", literal);
-        SourceFileNode::parse(&src)
+        SourceFile::parse(&src)
     }
 
     fn assert_valid_byte(literal: &str) {
diff --git a/crates/ra_syntax/src/validation/byte_string.rs b/crates/ra_syntax/src/validation/byte_string.rs
index f7a4fb156..670c43a09 100644
--- a/crates/ra_syntax/src/validation/byte_string.rs
+++ b/crates/ra_syntax/src/validation/byte_string.rs
@@ -9,7 +9,7 @@ use crate::{
 
 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: &ast::ByteString, 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);
@@ -43,12 +43,12 @@ pub(crate) fn validate_byte_string_node(node: ast::ByteString, errors: &mut Vec<
 
 #[cfg(test)]
 mod test {
-    use crate::SourceFileNode;
+    use crate::{SourceFile, TreePtr};
 
-    fn build_file(literal: &str) -> SourceFileNode {
+    fn build_file(literal: &str) -> TreePtr<SourceFile> {
         let src = format!(r#"const S: &'static [u8] = b"{}";"#, literal);
         println!("Source: {}", src);
-        SourceFileNode::parse(&src)
+        SourceFile::parse(&src)
     }
 
     fn assert_valid_str(literal: &str) {
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs
index 1d6fe8837..9cbd43fba 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -14,7 +14,7 @@ use crate::{
     },
 };
 
-pub(super) fn validate_char_node(node: ast::Char, errors: &mut Vec<SyntaxError>) {
+pub(super) fn validate_char_node(node: &ast::Char, 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);
@@ -175,11 +175,11 @@ fn validate_unicode_escape(text: &str, range: TextRange, errors: &mut Vec<Syntax
 
 #[cfg(test)]
 mod test {
-    use crate::SourceFileNode;
+    use crate::{SourceFile, TreePtr};
 
-    fn build_file(literal: &str) -> SourceFileNode {
+    fn build_file(literal: &str) -> TreePtr<SourceFile> {
         let src = format!("const C: char = '{}';", literal);
-        SourceFileNode::parse(&src)
+        SourceFile::parse(&src)
     }
 
     fn assert_valid_char(literal: &str) {
diff --git a/crates/ra_syntax/src/validation/string.rs b/crates/ra_syntax/src/validation/string.rs
index 1371bb1f0..7b2a68d12 100644
--- a/crates/ra_syntax/src/validation/string.rs
+++ b/crates/ra_syntax/src/validation/string.rs
@@ -9,7 +9,7 @@ use crate::{
 
 use super::char;
 
-pub(crate) fn validate_string_node(node: ast::String, errors: &mut Vec<SyntaxError>) {
+pub(crate) fn validate_string_node(node: &ast::String, 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);
@@ -38,12 +38,12 @@ pub(crate) fn validate_string_node(node: ast::String, errors: &mut Vec<SyntaxErr
 
 #[cfg(test)]
 mod test {
-    use crate::SourceFileNode;
+    use crate::{SourceFile, TreePtr};
 
-    fn build_file(literal: &str) -> SourceFileNode {
+    fn build_file(literal: &str) -> TreePtr<SourceFile> {
         let src = format!(r#"const S: &'static str = "{}";"#, literal);
         println!("Source: {}", src);
-        SourceFileNode::parse(&src)
+        SourceFile::parse(&src)
     }
 
     fn assert_valid_str(literal: &str) {