diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-13 14:02:26 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-13 14:02:26 +0000 |
commit | ebc95af2b5b91239fc1d8a5fc8344ded6f6ef3e4 (patch) | |
tree | fe84a7b9a434cb268faea247d9d6dbffed894696 /crates/ra_mbe/src/lib.rs | |
parent | 16cf6bcf4b614a7a1a3a3f3659f7bb3df7cff086 (diff) | |
parent | 98f98cbb5404385703a404547aa2477d4a2fd1cb (diff) |
Merge #2551
2551: Refactor tt::Subtree delimiter r=matklad a=edwin0cheng
Refactor to :
```
#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
pub struct Subtree {
pub delimiter: Option<Delimiter>,
pub token_trees: Vec<TokenTree>,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum Delimiter {
Parenthesis,
Brace,
Bracket,
}
```
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_mbe/src/lib.rs')
-rw-r--r-- | crates/ra_mbe/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs index bbddebe67..0d2d43bef 100644 --- a/crates/ra_mbe/src/lib.rs +++ b/crates/ra_mbe/src/lib.rs | |||
@@ -159,14 +159,14 @@ impl Rule { | |||
159 | .expect_subtree() | 159 | .expect_subtree() |
160 | .map_err(|()| ParseError::Expected("expected subtree".to_string()))? | 160 | .map_err(|()| ParseError::Expected("expected subtree".to_string()))? |
161 | .clone(); | 161 | .clone(); |
162 | lhs.delimiter = tt::Delimiter::None; | 162 | lhs.delimiter = None; |
163 | src.expect_char('=').map_err(|()| ParseError::Expected("expected `=`".to_string()))?; | 163 | src.expect_char('=').map_err(|()| ParseError::Expected("expected `=`".to_string()))?; |
164 | src.expect_char('>').map_err(|()| ParseError::Expected("expected `>`".to_string()))?; | 164 | src.expect_char('>').map_err(|()| ParseError::Expected("expected `>`".to_string()))?; |
165 | let mut rhs = src | 165 | let mut rhs = src |
166 | .expect_subtree() | 166 | .expect_subtree() |
167 | .map_err(|()| ParseError::Expected("expected subtree".to_string()))? | 167 | .map_err(|()| ParseError::Expected("expected subtree".to_string()))? |
168 | .clone(); | 168 | .clone(); |
169 | rhs.delimiter = tt::Delimiter::None; | 169 | rhs.delimiter = None; |
170 | Ok(crate::Rule { lhs, rhs }) | 170 | Ok(crate::Rule { lhs, rhs }) |
171 | } | 171 | } |
172 | } | 172 | } |