aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_mbe/src/syntax_bridge.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-12-19 15:17:22 +0000
committerAleksey Kladov <[email protected]>2019-12-19 15:23:23 +0000
commit6edc54a1e6a48f6fe3191c549befe91674342d9a (patch)
treeb82af260fc89c4de8a9de300bc9a61e272a1329f /crates/ra_mbe/src/syntax_bridge.rs
parente17dcc45a679c025e79639bd2d22c3b0f20953f9 (diff)
Refactor macro tests
Diffstat (limited to 'crates/ra_mbe/src/syntax_bridge.rs')
-rw-r--r--crates/ra_mbe/src/syntax_bridge.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index 2c60430d1..ea2cac069 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -476,7 +476,7 @@ impl<'a> TreeSink for TtTreeSink<'a> {
476#[cfg(test)] 476#[cfg(test)]
477mod tests { 477mod tests {
478 use super::*; 478 use super::*;
479 use crate::tests::{create_rules, expand}; 479 use crate::tests::parse_macro;
480 use ra_parser::TokenSource; 480 use ra_parser::TokenSource;
481 use ra_syntax::{ 481 use ra_syntax::{
482 algo::{insert_children, InsertPosition}, 482 algo::{insert_children, InsertPosition},
@@ -485,7 +485,7 @@ mod tests {
485 485
486 #[test] 486 #[test]
487 fn convert_tt_token_source() { 487 fn convert_tt_token_source() {
488 let rules = create_rules( 488 let expansion = parse_macro(
489 r#" 489 r#"
490 macro_rules! literals { 490 macro_rules! literals {
491 ($i:ident) => { 491 ($i:ident) => {
@@ -498,8 +498,8 @@ mod tests {
498 } 498 }
499 } 499 }
500 "#, 500 "#,
501 ); 501 )
502 let expansion = expand(&rules, "literals!(foo);"); 502 .expand_tt("literals!(foo);");
503 let tts = &[expansion.into()]; 503 let tts = &[expansion.into()];
504 let buffer = tt::buffer::TokenBuffer::new(tts); 504 let buffer = tt::buffer::TokenBuffer::new(tts);
505 let mut tt_src = SubtreeTokenSource::new(&buffer); 505 let mut tt_src = SubtreeTokenSource::new(&buffer);
@@ -527,7 +527,7 @@ mod tests {
527 527
528 #[test] 528 #[test]
529 fn stmts_token_trees_to_expr_is_err() { 529 fn stmts_token_trees_to_expr_is_err() {
530 let rules = create_rules( 530 let expansion = parse_macro(
531 r#" 531 r#"
532 macro_rules! stmts { 532 macro_rules! stmts {
533 () => { 533 () => {
@@ -538,8 +538,8 @@ mod tests {
538 } 538 }
539 } 539 }
540 "#, 540 "#,
541 ); 541 )
542 let expansion = expand(&rules, "stmts!();"); 542 .expand_tt("stmts!();");
543 assert!(token_tree_to_syntax_node(&expansion, FragmentKind::Expr).is_err()); 543 assert!(token_tree_to_syntax_node(&expansion, FragmentKind::Expr).is_err());
544 } 544 }
545 545