diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-20 20:33:40 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-20 20:33:40 +0000 |
commit | c84561bb624280b84eb2fe6c6b2a6b9fe3f1dbf7 (patch) | |
tree | e47aa900bcffffded370b68b2e50604199b491e3 /crates/ra_syntax/src/syntax_error.rs | |
parent | 96899f8278b787280bd07d9ac9dce29a610ce40d (diff) | |
parent | 882c47f1870f15cb2aaad8871ccbad1c51520f49 (diff) |
Merge #863
863: Token source r=matklad a=matklad
Some reshuffling of parser's API with the eye towards extracting parse **without** syntax tree into a separate crate, to be used with macro expansion
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/syntax_error.rs')
-rw-r--r-- | crates/ra_syntax/src/syntax_error.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/ra_syntax/src/syntax_error.rs b/crates/ra_syntax/src/syntax_error.rs index 4ff998090..1a00fcc27 100644 --- a/crates/ra_syntax/src/syntax_error.rs +++ b/crates/ra_syntax/src/syntax_error.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use std::fmt; | 1 | use std::fmt; |
2 | 2 | ||
3 | use crate::{TextRange, TextUnit}; | 3 | use crate::{TextRange, TextUnit, parsing::ParseError}; |
4 | 4 | ||
5 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 5 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
6 | pub struct SyntaxError { | 6 | pub struct SyntaxError { |
@@ -95,9 +95,6 @@ pub enum SyntaxErrorKind { | |||
95 | InvalidMatchInnerAttr, | 95 | InvalidMatchInnerAttr, |
96 | } | 96 | } |
97 | 97 | ||
98 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | ||
99 | pub struct ParseError(pub String); | ||
100 | |||
101 | impl fmt::Display for SyntaxErrorKind { | 98 | impl fmt::Display for SyntaxErrorKind { |
102 | fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | 99 | fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { |
103 | use self::SyntaxErrorKind::*; | 100 | use self::SyntaxErrorKind::*; |