diff options
author | Jonas Schievink <[email protected]> | 2021-04-04 00:46:45 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2021-04-04 00:46:45 +0100 |
commit | 3abcdc03ba335fb3487c62547f61746e4a199fe6 (patch) | |
tree | 8386a83d383563308a83f4491d313be043dc94d3 /crates/mbe | |
parent | bcf600fc881026ab018d0a8ae09eff7e54af538b (diff) |
Make `ast_to_token_tree` infallible
It could never return `None`, so reflect that in the return type
Diffstat (limited to 'crates/mbe')
-rw-r--r-- | crates/mbe/src/benchmark.rs | 2 | ||||
-rw-r--r-- | crates/mbe/src/expander.rs | 6 | ||||
-rw-r--r-- | crates/mbe/src/syntax_bridge.rs | 20 | ||||
-rw-r--r-- | crates/mbe/src/tests.rs | 11 | ||||
-rw-r--r-- | crates/mbe/src/tests/rule.rs | 2 |
5 files changed, 19 insertions, 22 deletions
diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs index ba814a2e1..38707ffa5 100644 --- a/crates/mbe/src/benchmark.rs +++ b/crates/mbe/src/benchmark.rs | |||
@@ -65,7 +65,7 @@ fn macro_rules_fixtures_tt() -> FxHashMap<String, tt::Subtree> { | |||
65 | .filter_map(ast::MacroRules::cast) | 65 | .filter_map(ast::MacroRules::cast) |
66 | .map(|rule| { | 66 | .map(|rule| { |
67 | let id = rule.name().unwrap().to_string(); | 67 | let id = rule.name().unwrap().to_string(); |
68 | let (def_tt, _) = ast_to_token_tree(&rule.token_tree().unwrap()).unwrap(); | 68 | let (def_tt, _) = ast_to_token_tree(&rule.token_tree().unwrap()); |
69 | (id, def_tt) | 69 | (id, def_tt) |
70 | }) | 70 | }) |
71 | .collect() | 71 | .collect() |
diff --git a/crates/mbe/src/expander.rs b/crates/mbe/src/expander.rs index 3197c834c..bfef7f73d 100644 --- a/crates/mbe/src/expander.rs +++ b/crates/mbe/src/expander.rs | |||
@@ -159,8 +159,7 @@ mod tests { | |||
159 | let macro_definition = | 159 | let macro_definition = |
160 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); | 160 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); |
161 | 161 | ||
162 | let (definition_tt, _) = | 162 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.token_tree().unwrap()); |
163 | ast_to_token_tree(¯o_definition.token_tree().unwrap()).unwrap(); | ||
164 | crate::MacroRules::parse(&definition_tt).unwrap() | 163 | crate::MacroRules::parse(&definition_tt).unwrap() |
165 | } | 164 | } |
166 | 165 | ||
@@ -169,8 +168,7 @@ mod tests { | |||
169 | let macro_invocation = | 168 | let macro_invocation = |
170 | source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); | 169 | source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); |
171 | 170 | ||
172 | let (invocation_tt, _) = | 171 | let (invocation_tt, _) = ast_to_token_tree(¯o_invocation.token_tree().unwrap()); |
173 | ast_to_token_tree(¯o_invocation.token_tree().unwrap()).unwrap(); | ||
174 | 172 | ||
175 | expand_rules(&rules.rules, &invocation_tt) | 173 | expand_rules(&rules.rules, &invocation_tt) |
176 | } | 174 | } |
diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs index ae0780072..9ba98f7fb 100644 --- a/crates/mbe/src/syntax_bridge.rs +++ b/crates/mbe/src/syntax_bridge.rs | |||
@@ -43,18 +43,18 @@ pub struct TokenMap { | |||
43 | 43 | ||
44 | /// Convert the syntax tree (what user has written) to a `TokenTree` (what macro | 44 | /// Convert the syntax tree (what user has written) to a `TokenTree` (what macro |
45 | /// will consume). | 45 | /// will consume). |
46 | pub fn ast_to_token_tree(ast: &impl ast::AstNode) -> Option<(tt::Subtree, TokenMap)> { | 46 | pub fn ast_to_token_tree(ast: &impl ast::AstNode) -> (tt::Subtree, TokenMap) { |
47 | syntax_node_to_token_tree(ast.syntax()) | 47 | syntax_node_to_token_tree(ast.syntax()) |
48 | } | 48 | } |
49 | 49 | ||
50 | /// Convert the syntax node to a `TokenTree` (what macro | 50 | /// Convert the syntax node to a `TokenTree` (what macro |
51 | /// will consume). | 51 | /// will consume). |
52 | pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> Option<(tt::Subtree, TokenMap)> { | 52 | pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> (tt::Subtree, TokenMap) { |
53 | let global_offset = node.text_range().start(); | 53 | let global_offset = node.text_range().start(); |
54 | let mut c = Convertor::new(node, global_offset); | 54 | let mut c = Convertor::new(node, global_offset); |
55 | let subtree = c.go()?; | 55 | let subtree = c.go(); |
56 | c.id_alloc.map.entries.shrink_to_fit(); | 56 | c.id_alloc.map.entries.shrink_to_fit(); |
57 | Some((subtree, c.id_alloc.map)) | 57 | (subtree, c.id_alloc.map) |
58 | } | 58 | } |
59 | 59 | ||
60 | // The following items are what `rustc` macro can be parsed into : | 60 | // The following items are what `rustc` macro can be parsed into : |
@@ -108,7 +108,7 @@ pub fn parse_to_token_tree(text: &str) -> Option<(tt::Subtree, TokenMap)> { | |||
108 | }, | 108 | }, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | let subtree = conv.go()?; | 111 | let subtree = conv.go(); |
112 | Some((subtree, conv.id_alloc.map)) | 112 | Some((subtree, conv.id_alloc.map)) |
113 | } | 113 | } |
114 | 114 | ||
@@ -319,7 +319,7 @@ trait SrcToken: std::fmt::Debug { | |||
319 | trait TokenConvertor { | 319 | trait TokenConvertor { |
320 | type Token: SrcToken; | 320 | type Token: SrcToken; |
321 | 321 | ||
322 | fn go(&mut self) -> Option<tt::Subtree> { | 322 | fn go(&mut self) -> tt::Subtree { |
323 | let mut subtree = tt::Subtree::default(); | 323 | let mut subtree = tt::Subtree::default(); |
324 | subtree.delimiter = None; | 324 | subtree.delimiter = None; |
325 | while self.peek().is_some() { | 325 | while self.peek().is_some() { |
@@ -327,10 +327,10 @@ trait TokenConvertor { | |||
327 | } | 327 | } |
328 | if subtree.token_trees.len() == 1 { | 328 | if subtree.token_trees.len() == 1 { |
329 | if let tt::TokenTree::Subtree(first) = &subtree.token_trees[0] { | 329 | if let tt::TokenTree::Subtree(first) = &subtree.token_trees[0] { |
330 | return Some(first.clone()); | 330 | return first.clone(); |
331 | } | 331 | } |
332 | } | 332 | } |
333 | Some(subtree) | 333 | subtree |
334 | } | 334 | } |
335 | 335 | ||
336 | fn collect_leaf(&mut self, result: &mut Vec<tt::TokenTree>) { | 336 | fn collect_leaf(&mut self, result: &mut Vec<tt::TokenTree>) { |
@@ -858,7 +858,7 @@ mod tests { | |||
858 | // - T!['}'] | 858 | // - T!['}'] |
859 | // - WHITE_SPACE | 859 | // - WHITE_SPACE |
860 | let token_tree = ast::TokenTree::cast(token_tree).unwrap(); | 860 | let token_tree = ast::TokenTree::cast(token_tree).unwrap(); |
861 | let tt = ast_to_token_tree(&token_tree).unwrap().0; | 861 | let tt = ast_to_token_tree(&token_tree).0; |
862 | 862 | ||
863 | assert_eq!(tt.delimiter_kind(), Some(tt::DelimiterKind::Brace)); | 863 | assert_eq!(tt.delimiter_kind(), Some(tt::DelimiterKind::Brace)); |
864 | } | 864 | } |
@@ -867,7 +867,7 @@ mod tests { | |||
867 | fn test_token_tree_multi_char_punct() { | 867 | fn test_token_tree_multi_char_punct() { |
868 | let source_file = ast::SourceFile::parse("struct Foo { a: x::Y }").ok().unwrap(); | 868 | let source_file = ast::SourceFile::parse("struct Foo { a: x::Y }").ok().unwrap(); |
869 | let struct_def = source_file.syntax().descendants().find_map(ast::Struct::cast).unwrap(); | 869 | let struct_def = source_file.syntax().descendants().find_map(ast::Struct::cast).unwrap(); |
870 | let tt = ast_to_token_tree(&struct_def).unwrap().0; | 870 | let tt = ast_to_token_tree(&struct_def).0; |
871 | token_tree_to_syntax_node(&tt, FragmentKind::Item).unwrap(); | 871 | token_tree_to_syntax_node(&tt, FragmentKind::Item).unwrap(); |
872 | } | 872 | } |
873 | } | 873 | } |
diff --git a/crates/mbe/src/tests.rs b/crates/mbe/src/tests.rs index 6da18ecf4..3698ff3f0 100644 --- a/crates/mbe/src/tests.rs +++ b/crates/mbe/src/tests.rs | |||
@@ -29,8 +29,7 @@ macro_rules! impl_fixture { | |||
29 | let macro_invocation = | 29 | let macro_invocation = |
30 | source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); | 30 | source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); |
31 | 31 | ||
32 | let (invocation_tt, _) = ast_to_token_tree(¯o_invocation.token_tree().unwrap()) | 32 | let (invocation_tt, _) = ast_to_token_tree(¯o_invocation.token_tree().unwrap()); |
33 | .ok_or_else(|| ExpandError::ConversionError)?; | ||
34 | 33 | ||
35 | self.rules.expand(&invocation_tt).result() | 34 | self.rules.expand(&invocation_tt).result() |
36 | } | 35 | } |
@@ -101,7 +100,7 @@ macro_rules! impl_fixture { | |||
101 | .descendants() | 100 | .descendants() |
102 | .find_map(ast::TokenTree::cast) | 101 | .find_map(ast::TokenTree::cast) |
103 | .unwrap(); | 102 | .unwrap(); |
104 | let mut wrapped = ast_to_token_tree(&wrapped).unwrap().0; | 103 | let mut wrapped = ast_to_token_tree(&wrapped).0; |
105 | wrapped.delimiter = None; | 104 | wrapped.delimiter = None; |
106 | wrapped | 105 | wrapped |
107 | }; | 106 | }; |
@@ -151,7 +150,7 @@ pub(crate) fn parse_macro_error(ra_fixture: &str) -> ParseError { | |||
151 | 150 | ||
152 | pub(crate) fn parse_to_token_tree_by_syntax(ra_fixture: &str) -> tt::Subtree { | 151 | pub(crate) fn parse_to_token_tree_by_syntax(ra_fixture: &str) -> tt::Subtree { |
153 | let source_file = ast::SourceFile::parse(ra_fixture).ok().unwrap(); | 152 | let source_file = ast::SourceFile::parse(ra_fixture).ok().unwrap(); |
154 | let tt = syntax_node_to_token_tree(source_file.syntax()).unwrap().0; | 153 | let tt = syntax_node_to_token_tree(source_file.syntax()).0; |
155 | 154 | ||
156 | let parsed = parse_to_token_tree(ra_fixture).unwrap().0; | 155 | let parsed = parse_to_token_tree(ra_fixture).unwrap().0; |
157 | assert_eq!(tt, parsed); | 156 | assert_eq!(tt, parsed); |
@@ -164,7 +163,7 @@ fn parse_macro_rules_to_tt(ra_fixture: &str) -> tt::Subtree { | |||
164 | let macro_definition = | 163 | let macro_definition = |
165 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); | 164 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); |
166 | 165 | ||
167 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.token_tree().unwrap()).unwrap(); | 166 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.token_tree().unwrap()); |
168 | 167 | ||
169 | let parsed = parse_to_token_tree( | 168 | let parsed = parse_to_token_tree( |
170 | &ra_fixture[macro_definition.token_tree().unwrap().syntax().text_range()], | 169 | &ra_fixture[macro_definition.token_tree().unwrap().syntax().text_range()], |
@@ -181,7 +180,7 @@ fn parse_macro_def_to_tt(ra_fixture: &str) -> tt::Subtree { | |||
181 | let macro_definition = | 180 | let macro_definition = |
182 | source_file.syntax().descendants().find_map(ast::MacroDef::cast).unwrap(); | 181 | source_file.syntax().descendants().find_map(ast::MacroDef::cast).unwrap(); |
183 | 182 | ||
184 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.body().unwrap()).unwrap(); | 183 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.body().unwrap()); |
185 | 184 | ||
186 | let parsed = | 185 | let parsed = |
187 | parse_to_token_tree(&ra_fixture[macro_definition.body().unwrap().syntax().text_range()]) | 186 | parse_to_token_tree(&ra_fixture[macro_definition.body().unwrap().syntax().text_range()]) |
diff --git a/crates/mbe/src/tests/rule.rs b/crates/mbe/src/tests/rule.rs index bf48112b3..5c61a98fd 100644 --- a/crates/mbe/src/tests/rule.rs +++ b/crates/mbe/src/tests/rule.rs | |||
@@ -44,6 +44,6 @@ fn parse_macro_arm(arm_definition: &str) -> Result<crate::MacroRules, ParseError | |||
44 | let macro_definition = | 44 | let macro_definition = |
45 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); | 45 | source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap(); |
46 | 46 | ||
47 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.token_tree().unwrap()).unwrap(); | 47 | let (definition_tt, _) = ast_to_token_tree(¯o_definition.token_tree().unwrap()); |
48 | crate::MacroRules::parse(&definition_tt) | 48 | crate::MacroRules::parse(&definition_tt) |
49 | } | 49 | } |