Add classify_literal and undo expose next_token

2 files changed, 4 insertions, 6 deletions

diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs
index 3b127526d..38f0049ed 100644
--- a/crates/ra_mbe/src/lib.rs
+++ b/crates/ra_mbe/src/lib.rs
@@ -343,16 +343,14 @@ SOURCE_FILE@[0; 40)
             if let tt::TokenTree::Subtree(subtree) = tt {
                 return &subtree;
             }
-            assert!(false, "It is not a subtree");
-            unreachable!();
+            unreachable!("It is not a subtree");
         }
 
         fn to_literal(tt: &tt::TokenTree) -> &tt::Literal {
             if let tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) = tt {
                 return lit;
             }
-            assert!(false, "It is not a literal");
-            unreachable!();
+            unreachable!("It is not a literal");
         }
 
         let rules = create_rules(
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index fbf3d2e71..9664280b5 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -1,7 +1,7 @@
 use ra_parser::{TokenSource, TreeSink, ParseError};
 use ra_syntax::{
     AstNode, SyntaxNode, TextRange, SyntaxKind, SmolStr, SyntaxTreeBuilder, TreeArc, SyntaxElement,
-    ast, SyntaxKind::*, TextUnit, next_token
+    ast, SyntaxKind::*, TextUnit, classify_literal
 };
 
 /// Maps `tt::TokenId` to the relative range of the original token.
@@ -189,7 +189,7 @@ impl TtTokenSource {
     {
         let tok = match token {
             tt::Leaf::Literal(l) => TtToken {
-                kind: next_token(&l.text).kind,
+                kind: classify_literal(&l.text).unwrap().kind,
                 is_joint_to_next: false,
                 text: l.text.clone(),
             },