diff options
| author | Kevin DeLorey <[email protected]> | 2020-02-09 16:25:47 +0000 |
|---|---|---|
| committer | Kevin DeLorey <[email protected]> | 2020-02-09 16:37:43 +0000 |
| commit | a957c473fdb79880c39b73dc9e0c923093cf16ac (patch) | |
| tree | f998b548f530ce604651e0e6af314ed2ec74b3b5 /crates/ra_syntax/src/lib.rs | |
| parent | 22caf982b99c54058e2e9200aeea0e61cada284a (diff) | |
| parent | 1b9b13b4b4a75b5531c3f046ce6bf72d681f2732 (diff) | |
Merge branch 'master' into kdelorey/complete-trait-impl
Diffstat (limited to 'crates/ra_syntax/src/lib.rs')
| -rw-r--r-- | crates/ra_syntax/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 9931fec84..f8f4b64c1 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
| @@ -41,7 +41,9 @@ use crate::syntax_node::GreenNode; | |||
| 41 | pub use crate::{ | 41 | pub use crate::{ |
| 42 | algo::InsertPosition, | 42 | algo::InsertPosition, |
| 43 | ast::{AstNode, AstToken}, | 43 | ast::{AstNode, AstToken}, |
| 44 | parsing::{classify_literal, tokenize, Token}, | 44 | parsing::{ |
| 45 | lex_single_syntax_kind, lex_single_valid_syntax_kind, tokenize, Token, TokenizeError, | ||
| 46 | }, | ||
| 45 | ptr::{AstPtr, SyntaxNodePtr}, | 47 | ptr::{AstPtr, SyntaxNodePtr}, |
| 46 | syntax_error::{Location, SyntaxError, SyntaxErrorKind}, | 48 | syntax_error::{Location, SyntaxError, SyntaxErrorKind}, |
| 47 | syntax_node::{ | 49 | syntax_node::{ |