diff options
author | Galilée 'Bill' Enguehard <[email protected]> | 2020-05-21 22:27:38 +0100 |
---|---|---|
committer | Galilée 'Bill' Enguehard <[email protected]> | 2020-05-21 22:27:38 +0100 |
commit | 7fece3bdd2450c0807f7dd742239cae95f0cc65e (patch) | |
tree | 866c4db826c959e79c63a6727bdb9f2c61e6fc4f /crates/ra_syntax | |
parent | db926218b2082077750291f8426ddd28b284cd08 (diff) | |
parent | 59732df8d40dfadc6dcf5951265416576399712a (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into modname_spacing
Diffstat (limited to 'crates/ra_syntax')
198 files changed, 11929 insertions, 10905 deletions
diff --git a/crates/ra_syntax/src/algo.rs b/crates/ra_syntax/src/algo.rs index 2a8dac757..664894d1f 100644 --- a/crates/ra_syntax/src/algo.rs +++ b/crates/ra_syntax/src/algo.rs | |||
@@ -266,6 +266,15 @@ impl<'a> SyntaxRewriter<'a> { | |||
266 | let replacement = Replacement::Single(with.clone().into()); | 266 | let replacement = Replacement::Single(with.clone().into()); |
267 | self.replacements.insert(what, replacement); | 267 | self.replacements.insert(what, replacement); |
268 | } | 268 | } |
269 | pub fn replace_with_many<T: Clone + Into<SyntaxElement>>( | ||
270 | &mut self, | ||
271 | what: &T, | ||
272 | with: Vec<SyntaxElement>, | ||
273 | ) { | ||
274 | let what = what.clone().into(); | ||
275 | let replacement = Replacement::Many(with); | ||
276 | self.replacements.insert(what, replacement); | ||
277 | } | ||
269 | pub fn replace_ast<T: AstNode>(&mut self, what: &T, with: &T) { | 278 | pub fn replace_ast<T: AstNode>(&mut self, what: &T, with: &T) { |
270 | self.replace(what.syntax(), with.syntax()) | 279 | self.replace(what.syntax(), with.syntax()) |
271 | } | 280 | } |
@@ -302,31 +311,41 @@ impl<'a> SyntaxRewriter<'a> { | |||
302 | 311 | ||
303 | fn rewrite_children(&self, node: &SyntaxNode) -> SyntaxNode { | 312 | fn rewrite_children(&self, node: &SyntaxNode) -> SyntaxNode { |
304 | // FIXME: this could be made much faster. | 313 | // FIXME: this could be made much faster. |
305 | let new_children = | 314 | let mut new_children = Vec::new(); |
306 | node.children_with_tokens().flat_map(|it| self.rewrite_self(&it)).collect::<Vec<_>>(); | 315 | for child in node.children_with_tokens() { |
316 | self.rewrite_self(&mut new_children, &child); | ||
317 | } | ||
307 | with_children(node, new_children) | 318 | with_children(node, new_children) |
308 | } | 319 | } |
309 | 320 | ||
310 | fn rewrite_self( | 321 | fn rewrite_self( |
311 | &self, | 322 | &self, |
323 | acc: &mut Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>, | ||
312 | element: &SyntaxElement, | 324 | element: &SyntaxElement, |
313 | ) -> Option<NodeOrToken<rowan::GreenNode, rowan::GreenToken>> { | 325 | ) { |
314 | if let Some(replacement) = self.replacement(&element) { | 326 | if let Some(replacement) = self.replacement(&element) { |
315 | return match replacement { | 327 | match replacement { |
316 | Replacement::Single(NodeOrToken::Node(it)) => { | 328 | Replacement::Single(NodeOrToken::Node(it)) => { |
317 | Some(NodeOrToken::Node(it.green().clone())) | 329 | acc.push(NodeOrToken::Node(it.green().clone())) |
318 | } | 330 | } |
319 | Replacement::Single(NodeOrToken::Token(it)) => { | 331 | Replacement::Single(NodeOrToken::Token(it)) => { |
320 | Some(NodeOrToken::Token(it.green().clone())) | 332 | acc.push(NodeOrToken::Token(it.green().clone())) |
321 | } | 333 | } |
322 | Replacement::Delete => None, | 334 | Replacement::Many(replacements) => { |
335 | acc.extend(replacements.iter().map(|it| match it { | ||
336 | NodeOrToken::Node(it) => NodeOrToken::Node(it.green().clone()), | ||
337 | NodeOrToken::Token(it) => NodeOrToken::Token(it.green().clone()), | ||
338 | })) | ||
339 | } | ||
340 | Replacement::Delete => (), | ||
323 | }; | 341 | }; |
342 | return; | ||
324 | } | 343 | } |
325 | let res = match element { | 344 | let res = match element { |
326 | NodeOrToken::Token(it) => NodeOrToken::Token(it.green().clone()), | 345 | NodeOrToken::Token(it) => NodeOrToken::Token(it.green().clone()), |
327 | NodeOrToken::Node(it) => NodeOrToken::Node(self.rewrite_children(it).green().clone()), | 346 | NodeOrToken::Node(it) => NodeOrToken::Node(self.rewrite_children(it).green().clone()), |
328 | }; | 347 | }; |
329 | Some(res) | 348 | acc.push(res) |
330 | } | 349 | } |
331 | } | 350 | } |
332 | 351 | ||
@@ -341,6 +360,7 @@ impl ops::AddAssign for SyntaxRewriter<'_> { | |||
341 | enum Replacement { | 360 | enum Replacement { |
342 | Delete, | 361 | Delete, |
343 | Single(SyntaxElement), | 362 | Single(SyntaxElement), |
363 | Many(Vec<SyntaxElement>), | ||
344 | } | 364 | } |
345 | 365 | ||
346 | fn with_children( | 366 | fn with_children( |
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index 521ca8ab8..1876afe95 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs | |||
@@ -16,9 +16,7 @@ use crate::{ | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | pub use self::{ | 18 | pub use self::{ |
19 | expr_extensions::{ | 19 | expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp}, |
20 | ArrayExprKind, BinOp, BlockModifier, ElseBranch, LiteralKind, PrefixOp, RangeOp, | ||
21 | }, | ||
22 | extensions::{ | 20 | extensions::{ |
23 | AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents, | 21 | AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents, |
24 | StructKind, TypeBoundKind, VisibilityKind, | 22 | StructKind, TypeBoundKind, VisibilityKind, |
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs index 26e4576ff..29eb3fcb9 100644 --- a/crates/ra_syntax/src/ast/edit.rs +++ b/crates/ra_syntax/src/ast/edit.rs | |||
@@ -1,7 +1,10 @@ | |||
1 | //! This module contains functions for editing syntax trees. As the trees are | 1 | //! This module contains functions for editing syntax trees. As the trees are |
2 | //! immutable, all function here return a fresh copy of the tree, instead of | 2 | //! immutable, all function here return a fresh copy of the tree, instead of |
3 | //! doing an in-place modification. | 3 | //! doing an in-place modification. |
4 | use std::{iter, ops::RangeInclusive}; | 4 | use std::{ |
5 | fmt, iter, | ||
6 | ops::{self, RangeInclusive}, | ||
7 | }; | ||
5 | 8 | ||
6 | use arrayvec::ArrayVec; | 9 | use arrayvec::ArrayVec; |
7 | 10 | ||
@@ -28,7 +31,7 @@ impl ast::BinExpr { | |||
28 | 31 | ||
29 | impl ast::FnDef { | 32 | impl ast::FnDef { |
30 | #[must_use] | 33 | #[must_use] |
31 | pub fn with_body(&self, body: ast::Block) -> ast::FnDef { | 34 | pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef { |
32 | let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); | 35 | let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); |
33 | let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() { | 36 | let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() { |
34 | old_body.syntax().clone().into() | 37 | old_body.syntax().clone().into() |
@@ -79,7 +82,7 @@ where | |||
79 | 82 | ||
80 | impl ast::ItemList { | 83 | impl ast::ItemList { |
81 | #[must_use] | 84 | #[must_use] |
82 | pub fn append_items(&self, items: impl IntoIterator<Item = ast::ImplItem>) -> ast::ItemList { | 85 | pub fn append_items(&self, items: impl IntoIterator<Item = ast::AssocItem>) -> ast::ItemList { |
83 | let mut res = self.clone(); | 86 | let mut res = self.clone(); |
84 | if !self.syntax().text().contains_char('\n') { | 87 | if !self.syntax().text().contains_char('\n') { |
85 | res = make_multiline(res); | 88 | res = make_multiline(res); |
@@ -89,8 +92,8 @@ impl ast::ItemList { | |||
89 | } | 92 | } |
90 | 93 | ||
91 | #[must_use] | 94 | #[must_use] |
92 | pub fn append_item(&self, item: ast::ImplItem) -> ast::ItemList { | 95 | pub fn append_item(&self, item: ast::AssocItem) -> ast::ItemList { |
93 | let (indent, position) = match self.impl_items().last() { | 96 | let (indent, position) = match self.assoc_items().last() { |
94 | Some(it) => ( | 97 | Some(it) => ( |
95 | leading_indent(it.syntax()).unwrap_or_default().to_string(), | 98 | leading_indent(it.syntax()).unwrap_or_default().to_string(), |
96 | InsertPosition::After(it.syntax().clone().into()), | 99 | InsertPosition::After(it.syntax().clone().into()), |
@@ -437,6 +440,28 @@ impl From<u8> for IndentLevel { | |||
437 | } | 440 | } |
438 | } | 441 | } |
439 | 442 | ||
443 | impl fmt::Display for IndentLevel { | ||
444 | fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
445 | let spaces = " "; | ||
446 | let buf; | ||
447 | let len = self.0 as usize * 4; | ||
448 | let indent = if len <= spaces.len() { | ||
449 | &spaces[..len] | ||
450 | } else { | ||
451 | buf = iter::repeat(' ').take(len).collect::<String>(); | ||
452 | &buf | ||
453 | }; | ||
454 | fmt::Display::fmt(indent, f) | ||
455 | } | ||
456 | } | ||
457 | |||
458 | impl ops::Add<u8> for IndentLevel { | ||
459 | type Output = IndentLevel; | ||
460 | fn add(self, rhs: u8) -> IndentLevel { | ||
461 | IndentLevel(self.0 + rhs) | ||
462 | } | ||
463 | } | ||
464 | |||
440 | impl IndentLevel { | 465 | impl IndentLevel { |
441 | pub fn from_node(node: &SyntaxNode) -> IndentLevel { | 466 | pub fn from_node(node: &SyntaxNode) -> IndentLevel { |
442 | let first_token = match node.first_token() { | 467 | let first_token = match node.first_token() { |
@@ -453,11 +478,15 @@ impl IndentLevel { | |||
453 | IndentLevel(0) | 478 | IndentLevel(0) |
454 | } | 479 | } |
455 | 480 | ||
456 | pub fn increase_indent<N: AstNode>(self, node: N) -> N { | 481 | /// XXX: this intentionally doesn't change the indent of the very first token. |
457 | N::cast(self._increase_indent(node.syntax().clone())).unwrap() | 482 | /// Ie, in something like |
458 | } | 483 | /// ``` |
459 | 484 | /// fn foo() { | |
460 | fn _increase_indent(self, node: SyntaxNode) -> SyntaxNode { | 485 | /// 92 |
486 | /// } | ||
487 | /// ``` | ||
488 | /// if you indent the block, the `{` token would stay put. | ||
489 | fn increase_indent(self, node: SyntaxNode) -> SyntaxNode { | ||
461 | let mut rewriter = SyntaxRewriter::default(); | 490 | let mut rewriter = SyntaxRewriter::default(); |
462 | node.descendants_with_tokens() | 491 | node.descendants_with_tokens() |
463 | .filter_map(|el| el.into_token()) | 492 | .filter_map(|el| el.into_token()) |
@@ -467,22 +496,13 @@ impl IndentLevel { | |||
467 | text.contains('\n') | 496 | text.contains('\n') |
468 | }) | 497 | }) |
469 | .for_each(|ws| { | 498 | .for_each(|ws| { |
470 | let new_ws = make::tokens::whitespace(&format!( | 499 | let new_ws = make::tokens::whitespace(&format!("{}{}", ws.syntax(), self,)); |
471 | "{}{:width$}", | ||
472 | ws.syntax().text(), | ||
473 | "", | ||
474 | width = self.0 as usize * 4 | ||
475 | )); | ||
476 | rewriter.replace(ws.syntax(), &new_ws) | 500 | rewriter.replace(ws.syntax(), &new_ws) |
477 | }); | 501 | }); |
478 | rewriter.rewrite(&node) | 502 | rewriter.rewrite(&node) |
479 | } | 503 | } |
480 | 504 | ||
481 | pub fn decrease_indent<N: AstNode>(self, node: N) -> N { | 505 | fn decrease_indent(self, node: SyntaxNode) -> SyntaxNode { |
482 | N::cast(self._decrease_indent(node.syntax().clone())).unwrap() | ||
483 | } | ||
484 | |||
485 | fn _decrease_indent(self, node: SyntaxNode) -> SyntaxNode { | ||
486 | let mut rewriter = SyntaxRewriter::default(); | 506 | let mut rewriter = SyntaxRewriter::default(); |
487 | node.descendants_with_tokens() | 507 | node.descendants_with_tokens() |
488 | .filter_map(|el| el.into_token()) | 508 | .filter_map(|el| el.into_token()) |
@@ -493,7 +513,7 @@ impl IndentLevel { | |||
493 | }) | 513 | }) |
494 | .for_each(|ws| { | 514 | .for_each(|ws| { |
495 | let new_ws = make::tokens::whitespace( | 515 | let new_ws = make::tokens::whitespace( |
496 | &ws.syntax().text().replace(&format!("\n{:1$}", "", self.0 as usize * 4), "\n"), | 516 | &ws.syntax().text().replace(&format!("\n{}", self), "\n"), |
497 | ); | 517 | ); |
498 | rewriter.replace(ws.syntax(), &new_ws) | 518 | rewriter.replace(ws.syntax(), &new_ws) |
499 | }); | 519 | }); |
@@ -521,7 +541,7 @@ fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> { | |||
521 | iter::successors(Some(token), |token| token.prev_token()) | 541 | iter::successors(Some(token), |token| token.prev_token()) |
522 | } | 542 | } |
523 | 543 | ||
524 | pub trait AstNodeEdit: AstNode + Sized { | 544 | pub trait AstNodeEdit: AstNode + Clone + Sized { |
525 | #[must_use] | 545 | #[must_use] |
526 | fn insert_children( | 546 | fn insert_children( |
527 | &self, | 547 | &self, |
@@ -558,9 +578,17 @@ pub trait AstNodeEdit: AstNode + Sized { | |||
558 | } | 578 | } |
559 | rewriter.rewrite_ast(self) | 579 | rewriter.rewrite_ast(self) |
560 | } | 580 | } |
581 | #[must_use] | ||
582 | fn indent(&self, indent: IndentLevel) -> Self { | ||
583 | Self::cast(indent.increase_indent(self.syntax().clone())).unwrap() | ||
584 | } | ||
585 | #[must_use] | ||
586 | fn dedent(&self, indent: IndentLevel) -> Self { | ||
587 | Self::cast(indent.decrease_indent(self.syntax().clone())).unwrap() | ||
588 | } | ||
561 | } | 589 | } |
562 | 590 | ||
563 | impl<N: AstNode> AstNodeEdit for N {} | 591 | impl<N: AstNode + Clone> AstNodeEdit for N {} |
564 | 592 | ||
565 | fn single_node(element: impl Into<SyntaxElement>) -> RangeInclusive<SyntaxElement> { | 593 | fn single_node(element: impl Into<SyntaxElement>) -> RangeInclusive<SyntaxElement> { |
566 | let element = element.into(); | 594 | let element = element.into(); |
@@ -580,7 +608,7 @@ fn test_increase_indent() { | |||
580 | _ => (), | 608 | _ => (), |
581 | }" | 609 | }" |
582 | ); | 610 | ); |
583 | let indented = IndentLevel(2).increase_indent(arm_list); | 611 | let indented = arm_list.indent(IndentLevel(2)); |
584 | assert_eq!( | 612 | assert_eq!( |
585 | indented.syntax().to_string(), | 613 | indented.syntax().to_string(), |
586 | "{ | 614 | "{ |
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs index 352c0d2c5..7771d6759 100644 --- a/crates/ra_syntax/src/ast/expr_extensions.rs +++ b/crates/ra_syntax/src/ast/expr_extensions.rs | |||
@@ -16,7 +16,7 @@ impl ast::Expr { | |||
16 | | ast::Expr::WhileExpr(_) | 16 | | ast::Expr::WhileExpr(_) |
17 | | ast::Expr::BlockExpr(_) | 17 | | ast::Expr::BlockExpr(_) |
18 | | ast::Expr::MatchExpr(_) | 18 | | ast::Expr::MatchExpr(_) |
19 | | ast::Expr::TryExpr(_) => true, | 19 | | ast::Expr::EffectExpr(_) => true, |
20 | _ => false, | 20 | _ => false, |
21 | } | 21 | } |
22 | } | 22 | } |
@@ -43,7 +43,7 @@ impl ast::IfExpr { | |||
43 | Some(res) | 43 | Some(res) |
44 | } | 44 | } |
45 | 45 | ||
46 | fn blocks(&self) -> AstChildren<ast::BlockExpr> { | 46 | pub fn blocks(&self) -> AstChildren<ast::BlockExpr> { |
47 | support::children(self.syntax()) | 47 | support::children(self.syntax()) |
48 | } | 48 | } |
49 | } | 49 | } |
@@ -359,22 +359,34 @@ impl ast::Literal { | |||
359 | } | 359 | } |
360 | } | 360 | } |
361 | 361 | ||
362 | pub enum BlockModifier { | 362 | #[derive(Debug, Clone, PartialEq, Eq)] |
363 | pub enum Effect { | ||
363 | Async(SyntaxToken), | 364 | Async(SyntaxToken), |
364 | Unsafe(SyntaxToken), | 365 | Unsafe(SyntaxToken), |
366 | Try(SyntaxToken), | ||
367 | // Very much not an effect, but we stuff it into this node anyway | ||
368 | Label(ast::Label), | ||
365 | } | 369 | } |
366 | 370 | ||
367 | impl ast::BlockExpr { | 371 | impl ast::EffectExpr { |
368 | pub fn modifier(&self) -> Option<BlockModifier> { | 372 | pub fn effect(&self) -> Effect { |
369 | if let Some(token) = self.async_token() { | 373 | if let Some(token) = self.async_token() { |
370 | return Some(BlockModifier::Async(token)); | 374 | return Effect::Async(token); |
371 | } | 375 | } |
372 | if let Some(token) = self.unsafe_token() { | 376 | if let Some(token) = self.unsafe_token() { |
373 | return Some(BlockModifier::Unsafe(token)); | 377 | return Effect::Unsafe(token); |
378 | } | ||
379 | if let Some(token) = self.try_token() { | ||
380 | return Effect::Try(token); | ||
381 | } | ||
382 | if let Some(label) = self.label() { | ||
383 | return Effect::Label(label); | ||
374 | } | 384 | } |
375 | None | 385 | unreachable!("ast::EffectExpr without Effect") |
376 | } | 386 | } |
387 | } | ||
377 | 388 | ||
389 | impl ast::BlockExpr { | ||
378 | /// false if the block is an intrinsic part of the syntax and can't be | 390 | /// false if the block is an intrinsic part of the syntax and can't be |
379 | /// replaced with arbitrary expression. | 391 | /// replaced with arbitrary expression. |
380 | /// | 392 | /// |
@@ -383,15 +395,12 @@ impl ast::BlockExpr { | |||
383 | /// const FOO: () = { stand_alone }; | 395 | /// const FOO: () = { stand_alone }; |
384 | /// ``` | 396 | /// ``` |
385 | pub fn is_standalone(&self) -> bool { | 397 | pub fn is_standalone(&self) -> bool { |
386 | if self.modifier().is_some() { | ||
387 | return false; | ||
388 | } | ||
389 | let parent = match self.syntax().parent() { | 398 | let parent = match self.syntax().parent() { |
390 | Some(it) => it, | 399 | Some(it) => it, |
391 | None => return true, | 400 | None => return true, |
392 | }; | 401 | }; |
393 | match parent.kind() { | 402 | match parent.kind() { |
394 | FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR => false, | 403 | FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR => false, |
395 | _ => true, | 404 | _ => true, |
396 | } | 405 | } |
397 | } | 406 | } |
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index 45e3dd2d3..98c38d009 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs | |||
@@ -423,6 +423,10 @@ impl ast::MacroCall { | |||
423 | None | 423 | None |
424 | } | 424 | } |
425 | } | 425 | } |
426 | |||
427 | pub fn is_bang(&self) -> bool { | ||
428 | self.is_macro_rules().is_none() | ||
429 | } | ||
426 | } | 430 | } |
427 | 431 | ||
428 | impl ast::LifetimeParam { | 432 | impl ast::LifetimeParam { |
@@ -463,7 +467,7 @@ impl ast::TokenTree { | |||
463 | 467 | ||
464 | pub fn right_delimiter_token(&self) -> Option<SyntaxToken> { | 468 | pub fn right_delimiter_token(&self) -> Option<SyntaxToken> { |
465 | self.syntax().last_child_or_token()?.into_token().filter(|it| match it.kind() { | 469 | self.syntax().last_child_or_token()?.into_token().filter(|it| match it.kind() { |
466 | T!['{'] | T!['('] | T!['['] => true, | 470 | T!['}'] | T![')'] | T![']'] => true, |
467 | _ => false, | 471 | _ => false, |
468 | }) | 472 | }) |
469 | } | 473 | } |
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 3f16592b6..cf6067e57 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs | |||
@@ -5,17 +5,41 @@ use crate::{ | |||
5 | SyntaxKind::{self, *}, | 5 | SyntaxKind::{self, *}, |
6 | SyntaxNode, SyntaxToken, T, | 6 | SyntaxNode, SyntaxToken, T, |
7 | }; | 7 | }; |
8 | 8 | /// The entire Rust source file. Includes all top-level inner attributes and module items. | |
9 | /// | ||
10 | /// [Reference](https://doc.rust-lang.org/reference/crates-and-source-files.html) | ||
9 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 11 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
10 | pub struct SourceFile { | 12 | pub struct SourceFile { |
11 | pub(crate) syntax: SyntaxNode, | 13 | pub(crate) syntax: SyntaxNode, |
12 | } | 14 | } |
13 | impl ast::ModuleItemOwner for SourceFile {} | 15 | impl ast::ModuleItemOwner for SourceFile {} |
14 | impl ast::AttrsOwner for SourceFile {} | 16 | impl ast::AttrsOwner for SourceFile {} |
17 | impl ast::DocCommentsOwner for SourceFile {} | ||
15 | impl SourceFile { | 18 | impl SourceFile { |
16 | pub fn modules(&self) -> AstChildren<Module> { support::children(&self.syntax) } | 19 | pub fn modules(&self) -> AstChildren<Module> { support::children(&self.syntax) } |
17 | } | 20 | } |
18 | 21 | /// Function definition either with body or not. | |
22 | /// Includes all of its attributes and doc comments. | ||
23 | /// | ||
24 | /// ``` | ||
25 | /// ❰ | ||
26 | /// /// Docs | ||
27 | /// #[attr] | ||
28 | /// pub extern "C" fn foo<T>(#[attr] Patern {p}: Pattern) -> u32 | ||
29 | /// where | ||
30 | /// T: Debug | ||
31 | /// { | ||
32 | /// 42 | ||
33 | /// } | ||
34 | /// ❱ | ||
35 | /// | ||
36 | /// extern "C" { | ||
37 | /// ❰ fn fn_decl(also_variadic_ffi: u32, ...) -> u32; ❱ | ||
38 | /// } | ||
39 | /// ``` | ||
40 | /// | ||
41 | /// - [Reference](https://doc.rust-lang.org/reference/items/functions.html) | ||
42 | /// - [Nomicon](https://doc.rust-lang.org/nomicon/ffi.html#variadic-functions) | ||
19 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 43 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
20 | pub struct FnDef { | 44 | pub struct FnDef { |
21 | pub(crate) syntax: SyntaxNode, | 45 | pub(crate) syntax: SyntaxNode, |
@@ -37,7 +61,13 @@ impl FnDef { | |||
37 | pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) } | 61 | pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) } |
38 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 62 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
39 | } | 63 | } |
40 | 64 | /// Return type annotation. | |
65 | /// | ||
66 | /// ``` | ||
67 | /// fn foo(a: u32) ❰ -> Option<u32> ❱ { Some(a) } | ||
68 | /// ``` | ||
69 | /// | ||
70 | /// [Reference](https://doc.rust-lang.org/reference/items/functions.html) | ||
41 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 71 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
42 | pub struct RetType { | 72 | pub struct RetType { |
43 | pub(crate) syntax: SyntaxNode, | 73 | pub(crate) syntax: SyntaxNode, |
@@ -46,7 +76,26 @@ impl RetType { | |||
46 | pub fn thin_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![->]) } | 76 | pub fn thin_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![->]) } |
47 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 77 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
48 | } | 78 | } |
49 | 79 | /// Struct definition. | |
80 | /// Includes all of its attributes and doc comments. | ||
81 | /// | ||
82 | /// ``` | ||
83 | /// ❰ | ||
84 | /// /// Docs | ||
85 | /// #[attr] | ||
86 | /// struct Foo<T> where T: Debug { | ||
87 | /// /// Docs | ||
88 | /// #[attr] | ||
89 | /// pub a: u32, | ||
90 | /// b: T, | ||
91 | /// } | ||
92 | /// ❱ | ||
93 | /// | ||
94 | /// ❰ struct Foo; ❱ | ||
95 | /// ❰ struct Foo<T>(#[attr] T) where T: Debug; ❱ | ||
96 | /// ``` | ||
97 | /// | ||
98 | /// [Reference](https://doc.rust-lang.org/reference/items/structs.html) | ||
50 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 99 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
51 | pub struct StructDef { | 100 | pub struct StructDef { |
52 | pub(crate) syntax: SyntaxNode, | 101 | pub(crate) syntax: SyntaxNode, |
@@ -61,7 +110,23 @@ impl StructDef { | |||
61 | pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) } | 110 | pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) } |
62 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 111 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
63 | } | 112 | } |
64 | 113 | /// Union definition. | |
114 | /// Includes all of its attributes and doc comments. | ||
115 | /// | ||
116 | /// ``` | ||
117 | /// ❰ | ||
118 | /// /// Docs | ||
119 | /// #[attr] | ||
120 | /// pub union Foo<T> where T: Debug { | ||
121 | /// /// Docs | ||
122 | /// #[attr] | ||
123 | /// a: T, | ||
124 | /// b: u32, | ||
125 | /// } | ||
126 | /// ❱ | ||
127 | /// ``` | ||
128 | /// | ||
129 | /// [Reference](https://doc.rust-lang.org/reference/items/unions.html) | ||
65 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 130 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
66 | pub struct UnionDef { | 131 | pub struct UnionDef { |
67 | pub(crate) syntax: SyntaxNode, | 132 | pub(crate) syntax: SyntaxNode, |
@@ -77,7 +142,19 @@ impl UnionDef { | |||
77 | support::child(&self.syntax) | 142 | support::child(&self.syntax) |
78 | } | 143 | } |
79 | } | 144 | } |
80 | 145 | /// Record field definition list including enclosing curly braces. | |
146 | /// | ||
147 | /// ``` | ||
148 | /// struct Foo // same for union | ||
149 | /// ❰ | ||
150 | /// { | ||
151 | /// a: u32, | ||
152 | /// b: bool, | ||
153 | /// } | ||
154 | /// ❱ | ||
155 | /// ``` | ||
156 | /// | ||
157 | /// [Reference](https://doc.rust-lang.org/reference/items/structs.html) | ||
81 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 158 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
82 | pub struct RecordFieldDefList { | 159 | pub struct RecordFieldDefList { |
83 | pub(crate) syntax: SyntaxNode, | 160 | pub(crate) syntax: SyntaxNode, |
@@ -87,7 +164,22 @@ impl RecordFieldDefList { | |||
87 | pub fn fields(&self) -> AstChildren<RecordFieldDef> { support::children(&self.syntax) } | 164 | pub fn fields(&self) -> AstChildren<RecordFieldDef> { support::children(&self.syntax) } |
88 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 165 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
89 | } | 166 | } |
90 | 167 | /// Record field definition including its attributes and doc comments. | |
168 | /// | ||
169 | /// ` `` | ||
170 | /// same for union | ||
171 | /// struct Foo { | ||
172 | /// ❰ | ||
173 | /// /// Docs | ||
174 | /// #[attr] | ||
175 | /// pub a: u32 | ||
176 | /// ❱ | ||
177 | /// | ||
178 | /// ❰ b: bool ❱ | ||
179 | /// } | ||
180 | /// ``` | ||
181 | /// | ||
182 | /// [Reference](https://doc.rust-lang.org/reference/items/structs.html) | ||
91 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 183 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
92 | pub struct RecordFieldDef { | 184 | pub struct RecordFieldDef { |
93 | pub(crate) syntax: SyntaxNode, | 185 | pub(crate) syntax: SyntaxNode, |
@@ -98,7 +190,13 @@ impl ast::AttrsOwner for RecordFieldDef {} | |||
98 | impl ast::DocCommentsOwner for RecordFieldDef {} | 190 | impl ast::DocCommentsOwner for RecordFieldDef {} |
99 | impl ast::TypeAscriptionOwner for RecordFieldDef {} | 191 | impl ast::TypeAscriptionOwner for RecordFieldDef {} |
100 | impl RecordFieldDef {} | 192 | impl RecordFieldDef {} |
101 | 193 | /// Tuple field definition list including enclosing parens. | |
194 | /// | ||
195 | /// ``` | ||
196 | /// struct Foo ❰ (u32, String, Vec<u32>) ❱; | ||
197 | /// ``` | ||
198 | /// | ||
199 | /// [Reference](https://doc.rust-lang.org/reference/items/structs.html) | ||
102 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 200 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
103 | pub struct TupleFieldDefList { | 201 | pub struct TupleFieldDefList { |
104 | pub(crate) syntax: SyntaxNode, | 202 | pub(crate) syntax: SyntaxNode, |
@@ -108,7 +206,13 @@ impl TupleFieldDefList { | |||
108 | pub fn fields(&self) -> AstChildren<TupleFieldDef> { support::children(&self.syntax) } | 206 | pub fn fields(&self) -> AstChildren<TupleFieldDef> { support::children(&self.syntax) } |
109 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 207 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
110 | } | 208 | } |
111 | 209 | /// Tuple field definition including its attributes. | |
210 | /// | ||
211 | /// ``` | ||
212 | /// struct Foo(❰ #[attr] u32 ❱); | ||
213 | /// ``` | ||
214 | /// | ||
215 | /// [Reference](https://doc.rust-lang.org/reference/items/structs.html) | ||
112 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 216 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
113 | pub struct TupleFieldDef { | 217 | pub struct TupleFieldDef { |
114 | pub(crate) syntax: SyntaxNode, | 218 | pub(crate) syntax: SyntaxNode, |
@@ -118,7 +222,29 @@ impl ast::AttrsOwner for TupleFieldDef {} | |||
118 | impl TupleFieldDef { | 222 | impl TupleFieldDef { |
119 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 223 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
120 | } | 224 | } |
121 | 225 | /// Enum definition. | |
226 | /// Includes all of its attributes and doc comments. | ||
227 | /// | ||
228 | /// ``` | ||
229 | /// ❰ | ||
230 | /// /// Docs | ||
231 | /// #[attr] | ||
232 | /// pub enum Foo<T> where T: Debug { | ||
233 | /// /// Docs | ||
234 | /// #[attr] | ||
235 | /// Bar, | ||
236 | /// Baz(#[attr] u32), | ||
237 | /// Bruh { | ||
238 | /// a: u32, | ||
239 | /// /// Docs | ||
240 | /// #[attr] | ||
241 | /// b: T, | ||
242 | /// } | ||
243 | /// } | ||
244 | /// ❱ | ||
245 | /// ``` | ||
246 | /// | ||
247 | /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html) | ||
122 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 248 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
123 | pub struct EnumDef { | 249 | pub struct EnumDef { |
124 | pub(crate) syntax: SyntaxNode, | 250 | pub(crate) syntax: SyntaxNode, |
@@ -132,7 +258,22 @@ impl EnumDef { | |||
132 | pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) } | 258 | pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) } |
133 | pub fn variant_list(&self) -> Option<EnumVariantList> { support::child(&self.syntax) } | 259 | pub fn variant_list(&self) -> Option<EnumVariantList> { support::child(&self.syntax) } |
134 | } | 260 | } |
135 | 261 | /// Enum variant definition list including enclosing curly braces. | |
262 | /// | ||
263 | /// ``` | ||
264 | /// enum Foo | ||
265 | /// ❰ | ||
266 | /// { | ||
267 | /// Bar, | ||
268 | /// Baz(u32), | ||
269 | /// Bruh { | ||
270 | /// a: u32 | ||
271 | /// } | ||
272 | /// } | ||
273 | /// ❱ | ||
274 | /// ``` | ||
275 | /// | ||
276 | /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html) | ||
136 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 277 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
137 | pub struct EnumVariantList { | 278 | pub struct EnumVariantList { |
138 | pub(crate) syntax: SyntaxNode, | 279 | pub(crate) syntax: SyntaxNode, |
@@ -142,7 +283,21 @@ impl EnumVariantList { | |||
142 | pub fn variants(&self) -> AstChildren<EnumVariant> { support::children(&self.syntax) } | 283 | pub fn variants(&self) -> AstChildren<EnumVariant> { support::children(&self.syntax) } |
143 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 284 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
144 | } | 285 | } |
145 | 286 | /// Enum variant definition including its attributes and discriminant value definition. | |
287 | /// | ||
288 | /// ``` | ||
289 | /// enum Foo { | ||
290 | /// ❰ | ||
291 | /// /// Docs | ||
292 | /// #[attr] | ||
293 | /// Bar | ||
294 | /// ❱ | ||
295 | /// | ||
296 | /// // same for tuple and record variants | ||
297 | /// } | ||
298 | /// ``` | ||
299 | /// | ||
300 | /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html) | ||
146 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 301 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
147 | pub struct EnumVariant { | 302 | pub struct EnumVariant { |
148 | pub(crate) syntax: SyntaxNode, | 303 | pub(crate) syntax: SyntaxNode, |
@@ -156,7 +311,20 @@ impl EnumVariant { | |||
156 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | 311 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } |
157 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 312 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
158 | } | 313 | } |
159 | 314 | /// Trait definition. | |
315 | /// Includes all of its attributes and doc comments. | ||
316 | /// | ||
317 | /// ``` | ||
318 | /// ❰ | ||
319 | /// /// Docs | ||
320 | /// #[attr] | ||
321 | /// pub unsafe trait Foo<T>: Debug where T: Debug { | ||
322 | /// // ... | ||
323 | /// } | ||
324 | /// ❱ | ||
325 | /// ``` | ||
326 | /// | ||
327 | /// [Reference](https://doc.rust-lang.org/reference/items/traits.html) | ||
160 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 328 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
161 | pub struct TraitDef { | 329 | pub struct TraitDef { |
162 | pub(crate) syntax: SyntaxNode, | 330 | pub(crate) syntax: SyntaxNode, |
@@ -173,7 +341,27 @@ impl TraitDef { | |||
173 | pub fn trait_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![trait]) } | 341 | pub fn trait_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![trait]) } |
174 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } | 342 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } |
175 | } | 343 | } |
176 | 344 | /// Module definition either with body or not. | |
345 | /// Includes all of its inner and outer attributes, module items, doc comments. | ||
346 | /// | ||
347 | /// ``` | ||
348 | /// ❰ | ||
349 | /// /// Docs | ||
350 | /// #[attr] | ||
351 | /// pub mod foo; | ||
352 | /// ❱ | ||
353 | /// | ||
354 | /// ❰ | ||
355 | /// /// Docs | ||
356 | /// #[attr] | ||
357 | /// pub mod bar { | ||
358 | /// //! Inner docs | ||
359 | /// #![inner_attr] | ||
360 | /// } | ||
361 | /// ❱ | ||
362 | /// ``` | ||
363 | /// | ||
364 | /// [Reference](https://doc.rust-lang.org/reference/items/modules.html) | ||
177 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 365 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
178 | pub struct Module { | 366 | pub struct Module { |
179 | pub(crate) syntax: SyntaxNode, | 367 | pub(crate) syntax: SyntaxNode, |
@@ -187,7 +375,28 @@ impl Module { | |||
187 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } | 375 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } |
188 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 376 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
189 | } | 377 | } |
190 | 378 | /// Item defintion list. | |
379 | /// This is used for both top-level items and impl block items. | ||
380 | /// | ||
381 | /// ``` | ||
382 | /// ❰ | ||
383 | /// fn foo {} | ||
384 | /// struct Bar; | ||
385 | /// enum Baz; | ||
386 | /// trait Bruh; | ||
387 | /// const BRUUH: u32 = 42; | ||
388 | /// ❱ | ||
389 | /// | ||
390 | /// impl Foo | ||
391 | /// ❰ | ||
392 | /// { | ||
393 | /// fn bar() {} | ||
394 | /// const BAZ: u32 = 42; | ||
395 | /// } | ||
396 | /// ❱ | ||
397 | /// ``` | ||
398 | /// | ||
399 | /// [Reference](https://doc.rust-lang.org/reference/items.html) | ||
191 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 400 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
192 | pub struct ItemList { | 401 | pub struct ItemList { |
193 | pub(crate) syntax: SyntaxNode, | 402 | pub(crate) syntax: SyntaxNode, |
@@ -195,10 +404,21 @@ pub struct ItemList { | |||
195 | impl ast::ModuleItemOwner for ItemList {} | 404 | impl ast::ModuleItemOwner for ItemList {} |
196 | impl ItemList { | 405 | impl ItemList { |
197 | pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) } | 406 | pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) } |
198 | pub fn impl_items(&self) -> AstChildren<ImplItem> { support::children(&self.syntax) } | 407 | pub fn assoc_items(&self) -> AstChildren<AssocItem> { support::children(&self.syntax) } |
199 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 408 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
200 | } | 409 | } |
201 | 410 | /// Constant variable definition. | |
411 | /// Includes all of its attributes and doc comments. | ||
412 | /// | ||
413 | /// ``` | ||
414 | /// ❰ | ||
415 | /// /// Docs | ||
416 | /// #[attr] | ||
417 | /// pub const FOO: u32 = 42; | ||
418 | /// ❱ | ||
419 | /// ``` | ||
420 | /// | ||
421 | /// [Reference](https://doc.rust-lang.org/reference/items/constant-items.html) | ||
202 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 422 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
203 | pub struct ConstDef { | 423 | pub struct ConstDef { |
204 | pub(crate) syntax: SyntaxNode, | 424 | pub(crate) syntax: SyntaxNode, |
@@ -216,7 +436,18 @@ impl ConstDef { | |||
216 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } | 436 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } |
217 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 437 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
218 | } | 438 | } |
219 | 439 | /// Static variable definition. | |
440 | /// Includes all of its attributes and doc comments. | ||
441 | /// | ||
442 | /// ``` | ||
443 | /// ❰ | ||
444 | /// /// Docs | ||
445 | /// #[attr] | ||
446 | /// pub static mut FOO: u32 = 42; | ||
447 | /// ❱ | ||
448 | /// ``` | ||
449 | /// | ||
450 | /// [Reference](https://doc.rust-lang.org/reference/items/static-items.html) | ||
220 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 451 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
221 | pub struct StaticDef { | 452 | pub struct StaticDef { |
222 | pub(crate) syntax: SyntaxNode, | 453 | pub(crate) syntax: SyntaxNode, |
@@ -234,7 +465,24 @@ impl StaticDef { | |||
234 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } | 465 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } |
235 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 466 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
236 | } | 467 | } |
237 | 468 | /// Type alias definition. | |
469 | /// Includes associated type clauses with type bounds. | ||
470 | /// | ||
471 | /// ``` | ||
472 | /// ❰ | ||
473 | /// /// Docs | ||
474 | /// #[attr] | ||
475 | /// pub type Foo<T> where T: Debug = T; | ||
476 | /// ❱ | ||
477 | /// | ||
478 | /// trait Bar { | ||
479 | /// ❰ type Baz: Debug; ❱ | ||
480 | /// ❰ type Bruh = String; ❱ | ||
481 | /// ❰ type Bruuh: Debug = u32; ❱ | ||
482 | /// } | ||
483 | /// ``` | ||
484 | /// | ||
485 | /// [Reference](https://doc.rust-lang.org/reference/items/type-aliases.html) | ||
238 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 486 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
239 | pub struct TypeAliasDef { | 487 | pub struct TypeAliasDef { |
240 | pub(crate) syntax: SyntaxNode, | 488 | pub(crate) syntax: SyntaxNode, |
@@ -252,13 +500,27 @@ impl TypeAliasDef { | |||
252 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 500 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
253 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 501 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
254 | } | 502 | } |
255 | 503 | /// Inherent and trait impl definition. | |
504 | /// Includes all of its inner and outer attributes. | ||
505 | /// | ||
506 | /// ``` | ||
507 | /// ❰ | ||
508 | /// #[attr] | ||
509 | /// unsafe impl<T> const !Foo for Bar where T: Debug { | ||
510 | /// #![inner_attr] | ||
511 | /// // ... | ||
512 | /// } | ||
513 | /// ❱ | ||
514 | /// ``` | ||
515 | /// | ||
516 | /// [Reference](https://doc.rust-lang.org/reference/items/implementations.html) | ||
256 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 517 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
257 | pub struct ImplDef { | 518 | pub struct ImplDef { |
258 | pub(crate) syntax: SyntaxNode, | 519 | pub(crate) syntax: SyntaxNode, |
259 | } | 520 | } |
260 | impl ast::TypeParamsOwner for ImplDef {} | 521 | impl ast::TypeParamsOwner for ImplDef {} |
261 | impl ast::AttrsOwner for ImplDef {} | 522 | impl ast::AttrsOwner for ImplDef {} |
523 | impl ast::DocCommentsOwner for ImplDef {} | ||
262 | impl ImplDef { | 524 | impl ImplDef { |
263 | pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) } | 525 | pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) } |
264 | pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) } | 526 | pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) } |
@@ -268,7 +530,16 @@ impl ImplDef { | |||
268 | pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) } | 530 | pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) } |
269 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } | 531 | pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) } |
270 | } | 532 | } |
271 | 533 | /// Parenthesized type reference. | |
534 | /// Note: parens are only used for grouping, this is not a tuple type. | ||
535 | /// | ||
536 | /// ``` | ||
537 | /// // This is effectively just `u32`. | ||
538 | /// // Single-item tuple must be defined with a trailing comma: `(u32,)` | ||
539 | /// type Foo = ❰ (u32) ❱; | ||
540 | /// | ||
541 | /// let bar: &'static ❰ (dyn Debug) ❱ = "bruh"; | ||
542 | /// ``` | ||
272 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 543 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
273 | pub struct ParenType { | 544 | pub struct ParenType { |
274 | pub(crate) syntax: SyntaxNode, | 545 | pub(crate) syntax: SyntaxNode, |
@@ -278,7 +549,13 @@ impl ParenType { | |||
278 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 549 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
279 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 550 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
280 | } | 551 | } |
281 | 552 | /// Unnamed tuple type. | |
553 | /// | ||
554 | /// ``` | ||
555 | /// let foo: ❰ (u32, bool) ❱ = (42, true); | ||
556 | /// ``` | ||
557 | /// | ||
558 | /// [Reference](https://doc.rust-lang.org/reference/types/tuple.html) | ||
282 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 559 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
283 | pub struct TupleType { | 560 | pub struct TupleType { |
284 | pub(crate) syntax: SyntaxNode, | 561 | pub(crate) syntax: SyntaxNode, |
@@ -288,7 +565,17 @@ impl TupleType { | |||
288 | pub fn fields(&self) -> AstChildren<TypeRef> { support::children(&self.syntax) } | 565 | pub fn fields(&self) -> AstChildren<TypeRef> { support::children(&self.syntax) } |
289 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 566 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
290 | } | 567 | } |
291 | 568 | /// The never type (i.e. the exclamation point). | |
569 | /// | ||
570 | /// ``` | ||
571 | /// type T = ❰ ! ❱; | ||
572 | /// | ||
573 | /// fn no_return() -> ❰ ! ❱ { | ||
574 | /// loop {} | ||
575 | /// } | ||
576 | /// ``` | ||
577 | /// | ||
578 | /// [Reference](https://doc.rust-lang.org/reference/types/never.html) | ||
292 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 579 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
293 | pub struct NeverType { | 580 | pub struct NeverType { |
294 | pub(crate) syntax: SyntaxNode, | 581 | pub(crate) syntax: SyntaxNode, |
@@ -296,7 +583,17 @@ pub struct NeverType { | |||
296 | impl NeverType { | 583 | impl NeverType { |
297 | pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) } | 584 | pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) } |
298 | } | 585 | } |
299 | 586 | /// Path to a type. | |
587 | /// Includes single identifier type names and elaborate paths with | ||
588 | /// generic parameters. | ||
589 | /// | ||
590 | /// ``` | ||
591 | /// type Foo = ❰ String ❱; | ||
592 | /// type Bar = ❰ std::vec::Vec<T> ❱; | ||
593 | /// type Baz = ❰ ::bruh::<Bruuh as Iterator>::Item ❱; | ||
594 | /// ``` | ||
595 | /// | ||
596 | /// [Reference](https://doc.rust-lang.org/reference/paths.html) | ||
300 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 597 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
301 | pub struct PathType { | 598 | pub struct PathType { |
302 | pub(crate) syntax: SyntaxNode, | 599 | pub(crate) syntax: SyntaxNode, |
@@ -304,7 +601,14 @@ pub struct PathType { | |||
304 | impl PathType { | 601 | impl PathType { |
305 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 602 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
306 | } | 603 | } |
307 | 604 | /// Raw pointer type. | |
605 | /// | ||
606 | /// ``` | ||
607 | /// type Foo = ❰ *const u32 ❱; | ||
608 | /// type Bar = ❰ *mut u32 ❱; | ||
609 | /// ``` | ||
610 | /// | ||
611 | /// [Reference](https://doc.rust-lang.org/reference/types/pointer.html#raw-pointers-const-and-mut) | ||
308 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 612 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
309 | pub struct PointerType { | 613 | pub struct PointerType { |
310 | pub(crate) syntax: SyntaxNode, | 614 | pub(crate) syntax: SyntaxNode, |
@@ -315,7 +619,13 @@ impl PointerType { | |||
315 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } | 619 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } |
316 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 620 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
317 | } | 621 | } |
318 | 622 | /// Array type. | |
623 | /// | ||
624 | /// ``` | ||
625 | /// type Foo = ❰ [u32; 24 - 3] ❱; | ||
626 | /// ``` | ||
627 | /// | ||
628 | /// [Reference](https://doc.rust-lang.org/reference/types/array.html) | ||
319 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 629 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
320 | pub struct ArrayType { | 630 | pub struct ArrayType { |
321 | pub(crate) syntax: SyntaxNode, | 631 | pub(crate) syntax: SyntaxNode, |
@@ -327,7 +637,13 @@ impl ArrayType { | |||
327 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 637 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
328 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 638 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
329 | } | 639 | } |
330 | 640 | /// Slice type. | |
641 | /// | ||
642 | /// ``` | ||
643 | /// type Foo = ❰ [u8] ❱; | ||
644 | /// ``` | ||
645 | /// | ||
646 | /// [Reference](https://doc.rust-lang.org/reference/types/slice.html) | ||
331 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 647 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
332 | pub struct SliceType { | 648 | pub struct SliceType { |
333 | pub(crate) syntax: SyntaxNode, | 649 | pub(crate) syntax: SyntaxNode, |
@@ -337,7 +653,13 @@ impl SliceType { | |||
337 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 653 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
338 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 654 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
339 | } | 655 | } |
340 | 656 | /// Reference type. | |
657 | /// | ||
658 | /// ``` | ||
659 | /// type Foo = ❰ &'static str ❱; | ||
660 | /// ``` | ||
661 | /// | ||
662 | /// [Reference](https://doc.rust-lang.org/reference/types/pointer.html) | ||
341 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 663 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
342 | pub struct ReferenceType { | 664 | pub struct ReferenceType { |
343 | pub(crate) syntax: SyntaxNode, | 665 | pub(crate) syntax: SyntaxNode, |
@@ -350,7 +672,13 @@ impl ReferenceType { | |||
350 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } | 672 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } |
351 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 673 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
352 | } | 674 | } |
353 | 675 | /// Placeholder type (i.e. the underscore). | |
676 | /// | ||
677 | /// ``` | ||
678 | /// let foo: ❰ _ ❱ = 42_u32; | ||
679 | /// ``` | ||
680 | /// | ||
681 | /// [Reference](https://doc.rust-lang.org/reference/types/inferred.html) | ||
354 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 682 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
355 | pub struct PlaceholderType { | 683 | pub struct PlaceholderType { |
356 | pub(crate) syntax: SyntaxNode, | 684 | pub(crate) syntax: SyntaxNode, |
@@ -358,7 +686,15 @@ pub struct PlaceholderType { | |||
358 | impl PlaceholderType { | 686 | impl PlaceholderType { |
359 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } | 687 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } |
360 | } | 688 | } |
361 | 689 | /// Function pointer type (not to be confused with `Fn*` family of traits). | |
690 | /// | ||
691 | /// ``` | ||
692 | /// type Foo = ❰ async fn(#[attr] u32, named: bool) -> u32 ❱; | ||
693 | /// | ||
694 | /// type Bar = ❰ extern "C" fn(variadic: u32, #[attr] ...) ❱; | ||
695 | /// ``` | ||
696 | /// | ||
697 | /// [Reference](https://doc.rust-lang.org/reference/types/function-pointer.html) | ||
362 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 698 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
363 | pub struct FnPointerType { | 699 | pub struct FnPointerType { |
364 | pub(crate) syntax: SyntaxNode, | 700 | pub(crate) syntax: SyntaxNode, |
@@ -370,7 +706,13 @@ impl FnPointerType { | |||
370 | pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) } | 706 | pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) } |
371 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } | 707 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } |
372 | } | 708 | } |
373 | 709 | /// Higher order type. | |
710 | /// | ||
711 | /// ``` | ||
712 | /// type Foo = ❰ for<'a> fn(&'a str) ❱; | ||
713 | /// ``` | ||
714 | /// | ||
715 | /// [Reference](https://doc.rust-lang.org/nomicon/hrtb.html) | ||
374 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 716 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
375 | pub struct ForType { | 717 | pub struct ForType { |
376 | pub(crate) syntax: SyntaxNode, | 718 | pub(crate) syntax: SyntaxNode, |
@@ -380,7 +722,13 @@ impl ForType { | |||
380 | pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) } | 722 | pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) } |
381 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 723 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
382 | } | 724 | } |
383 | 725 | /// Opaque `impl Trait` type. | |
726 | /// | ||
727 | /// ``` | ||
728 | /// fn foo(bar: ❰ impl Debug + Eq ❱) {} | ||
729 | /// ``` | ||
730 | /// | ||
731 | /// [Reference](https://doc.rust-lang.org/reference/types/impl-trait.html) | ||
384 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 732 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
385 | pub struct ImplTraitType { | 733 | pub struct ImplTraitType { |
386 | pub(crate) syntax: SyntaxNode, | 734 | pub(crate) syntax: SyntaxNode, |
@@ -389,7 +737,13 @@ impl ast::TypeBoundsOwner for ImplTraitType {} | |||
389 | impl ImplTraitType { | 737 | impl ImplTraitType { |
390 | pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) } | 738 | pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) } |
391 | } | 739 | } |
392 | 740 | /// Trait object type. | |
741 | /// | ||
742 | /// ``` | ||
743 | /// type Foo = ❰ dyn Debug ❱; | ||
744 | /// ``` | ||
745 | /// | ||
746 | /// [Reference](https://doc.rust-lang.org/reference/types/trait-object.html) | ||
393 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 747 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
394 | pub struct DynTraitType { | 748 | pub struct DynTraitType { |
395 | pub(crate) syntax: SyntaxNode, | 749 | pub(crate) syntax: SyntaxNode, |
@@ -398,7 +752,13 @@ impl ast::TypeBoundsOwner for DynTraitType {} | |||
398 | impl DynTraitType { | 752 | impl DynTraitType { |
399 | pub fn dyn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![dyn]) } | 753 | pub fn dyn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![dyn]) } |
400 | } | 754 | } |
401 | 755 | /// Tuple literal. | |
756 | /// | ||
757 | /// ``` | ||
758 | /// ❰ (42, true) ❱; | ||
759 | /// ``` | ||
760 | /// | ||
761 | /// [Reference](https://doc.rust-lang.org/reference/expressions/tuple-expr.html) | ||
402 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 762 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
403 | pub struct TupleExpr { | 763 | pub struct TupleExpr { |
404 | pub(crate) syntax: SyntaxNode, | 764 | pub(crate) syntax: SyntaxNode, |
@@ -409,7 +769,15 @@ impl TupleExpr { | |||
409 | pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) } | 769 | pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) } |
410 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 770 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
411 | } | 771 | } |
412 | 772 | /// Array literal. | |
773 | /// | ||
774 | /// ``` | ||
775 | /// ❰ [#![inner_attr] true, false, true] ❱; | ||
776 | /// | ||
777 | /// ❰ ["baz"; 24] ❱; | ||
778 | /// ``` | ||
779 | /// | ||
780 | /// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html) | ||
413 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 781 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
414 | pub struct ArrayExpr { | 782 | pub struct ArrayExpr { |
415 | pub(crate) syntax: SyntaxNode, | 783 | pub(crate) syntax: SyntaxNode, |
@@ -421,7 +789,14 @@ impl ArrayExpr { | |||
421 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 789 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
422 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 790 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
423 | } | 791 | } |
424 | 792 | /// Parenthesized expression. | |
793 | /// Note: parens are only used for grouping, this is not a tuple literal. | ||
794 | /// | ||
795 | /// ``` | ||
796 | /// ❰ (#![inner_attr] 2 + 2) ❱ * 2; | ||
797 | /// ``` | ||
798 | /// | ||
799 | /// [Reference](https://doc.rust-lang.org/reference/expressions/grouped-expr.html) | ||
425 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 800 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
426 | pub struct ParenExpr { | 801 | pub struct ParenExpr { |
427 | pub(crate) syntax: SyntaxNode, | 802 | pub(crate) syntax: SyntaxNode, |
@@ -432,7 +807,19 @@ impl ParenExpr { | |||
432 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 807 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
433 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 808 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
434 | } | 809 | } |
435 | 810 | /// Path to a symbol in expression context. | |
811 | /// Includes single identifier variable names and elaborate paths with | ||
812 | /// generic parameters. | ||
813 | /// | ||
814 | /// ``` | ||
815 | /// ❰ Some::<i32> ❱; | ||
816 | /// ❰ foo ❱ + 42; | ||
817 | /// ❰ Vec::<i32>::push ❱; | ||
818 | /// ❰ <[i32]>::reverse ❱; | ||
819 | /// ❰ <String as std::borrow::Borrow<str>>::borrow ❱; | ||
820 | /// ``` | ||
821 | /// | ||
822 | /// [Reference](https://doc.rust-lang.org/reference/expressions/path-expr.html) | ||
436 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 823 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
437 | pub struct PathExpr { | 824 | pub struct PathExpr { |
438 | pub(crate) syntax: SyntaxNode, | 825 | pub(crate) syntax: SyntaxNode, |
@@ -440,7 +827,17 @@ pub struct PathExpr { | |||
440 | impl PathExpr { | 827 | impl PathExpr { |
441 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 828 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
442 | } | 829 | } |
443 | 830 | /// Anonymous callable object literal a.k.a. closure, lambda or functor. | |
831 | /// | ||
832 | /// ``` | ||
833 | /// ❰ || 42 ❱; | ||
834 | /// ❰ |a: u32| val + 1 ❱; | ||
835 | /// ❰ async |#[attr] Pattern(_): Pattern| { bar } ❱; | ||
836 | /// ❰ move || baz ❱; | ||
837 | /// ❰ || -> u32 { closure_with_ret_type_annotation_requires_block_expr } ❱ | ||
838 | /// ``` | ||
839 | /// | ||
840 | /// [Reference](https://doc.rust-lang.org/reference/expressions/closure-expr.html) | ||
444 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 841 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
445 | pub struct LambdaExpr { | 842 | pub struct LambdaExpr { |
446 | pub(crate) syntax: SyntaxNode, | 843 | pub(crate) syntax: SyntaxNode, |
@@ -454,7 +851,25 @@ impl LambdaExpr { | |||
454 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } | 851 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } |
455 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } | 852 | pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) } |
456 | } | 853 | } |
457 | 854 | /// If expression. Includes both regular `if` and `if let` forms. | |
855 | /// Beware that `else if` is a special case syntax sugar, because in general | ||
856 | /// there has to be block expression after `else`. | ||
857 | /// | ||
858 | /// ``` | ||
859 | /// ❰ if bool_cond { 42 } ❱ | ||
860 | /// ❰ if bool_cond { 42 } else { 24 } ❱ | ||
861 | /// ❰ if bool_cond { 42 } else if bool_cond2 { 42 } ❱ | ||
862 | /// | ||
863 | /// ❰ | ||
864 | /// if let Pattern(foo) = bar { | ||
865 | /// foo | ||
866 | /// } else { | ||
867 | /// panic!(); | ||
868 | /// } | ||
869 | /// ❱ | ||
870 | /// ``` | ||
871 | /// | ||
872 | /// [Reference](https://doc.rust-lang.org/reference/expressions/if-expr.html) | ||
458 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 873 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
459 | pub struct IfExpr { | 874 | pub struct IfExpr { |
460 | pub(crate) syntax: SyntaxNode, | 875 | pub(crate) syntax: SyntaxNode, |
@@ -464,7 +879,17 @@ impl IfExpr { | |||
464 | pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) } | 879 | pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) } |
465 | pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) } | 880 | pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) } |
466 | } | 881 | } |
467 | 882 | /// Unconditional loop expression. | |
883 | /// | ||
884 | /// ``` | ||
885 | /// ❰ | ||
886 | /// loop { | ||
887 | /// // yeah, it's that simple... | ||
888 | /// } | ||
889 | /// ❱ | ||
890 | /// ``` | ||
891 | /// | ||
892 | /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html) | ||
468 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 893 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
469 | pub struct LoopExpr { | 894 | pub struct LoopExpr { |
470 | pub(crate) syntax: SyntaxNode, | 895 | pub(crate) syntax: SyntaxNode, |
@@ -474,7 +899,45 @@ impl ast::LoopBodyOwner for LoopExpr {} | |||
474 | impl LoopExpr { | 899 | impl LoopExpr { |
475 | pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) } | 900 | pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) } |
476 | } | 901 | } |
477 | 902 | /// Block expression with an optional prefix (label, try ketword, | |
903 | /// unsafe keyword, async keyword...). | ||
904 | /// | ||
905 | /// ``` | ||
906 | /// ❰ | ||
907 | /// 'label: try { | ||
908 | /// None? | ||
909 | /// } | ||
910 | /// ❱ | ||
911 | /// ``` | ||
912 | /// | ||
913 | /// - [try block](https://doc.rust-lang.org/unstable-book/language-features/try-blocks.html) | ||
914 | /// - [unsafe block](https://doc.rust-lang.org/reference/expressions/block-expr.html#unsafe-blocks) | ||
915 | /// - [async block](https://doc.rust-lang.org/reference/expressions/block-expr.html#async-blocks) | ||
916 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | ||
917 | pub struct EffectExpr { | ||
918 | pub(crate) syntax: SyntaxNode, | ||
919 | } | ||
920 | impl ast::AttrsOwner for EffectExpr {} | ||
921 | impl EffectExpr { | ||
922 | pub fn label(&self) -> Option<Label> { support::child(&self.syntax) } | ||
923 | pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) } | ||
924 | pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) } | ||
925 | pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) } | ||
926 | pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) } | ||
927 | } | ||
928 | /// For loop expression. | ||
929 | /// Note: record struct literals are not valid as iterable expression | ||
930 | /// due to ambiguity. | ||
931 | /// | ||
932 | /// ``` | ||
933 | /// ❰ | ||
934 | /// for i in (0..4) { | ||
935 | /// dbg!(i); | ||
936 | /// } | ||
937 | /// ❱ | ||
938 | /// ``` | ||
939 | /// | ||
940 | /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#iterator-loops) | ||
478 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 941 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
479 | pub struct ForExpr { | 942 | pub struct ForExpr { |
480 | pub(crate) syntax: SyntaxNode, | 943 | pub(crate) syntax: SyntaxNode, |
@@ -487,7 +950,22 @@ impl ForExpr { | |||
487 | pub fn in_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![in]) } | 950 | pub fn in_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![in]) } |
488 | pub fn iterable(&self) -> Option<Expr> { support::child(&self.syntax) } | 951 | pub fn iterable(&self) -> Option<Expr> { support::child(&self.syntax) } |
489 | } | 952 | } |
490 | 953 | /// While loop expression. Includes both regular `while` and `while let` forms. | |
954 | /// | ||
955 | /// ``` | ||
956 | /// ❰ | ||
957 | /// while bool_cond { | ||
958 | /// 42; | ||
959 | /// } | ||
960 | /// ❱ | ||
961 | /// ❰ | ||
962 | /// while let Pattern(foo) = bar { | ||
963 | /// bar += 1; | ||
964 | /// } | ||
965 | /// ❱ | ||
966 | /// ``` | ||
967 | /// | ||
968 | /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops) | ||
491 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 969 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
492 | pub struct WhileExpr { | 970 | pub struct WhileExpr { |
493 | pub(crate) syntax: SyntaxNode, | 971 | pub(crate) syntax: SyntaxNode, |
@@ -498,7 +976,22 @@ impl WhileExpr { | |||
498 | pub fn while_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![while]) } | 976 | pub fn while_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![while]) } |
499 | pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) } | 977 | pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) } |
500 | } | 978 | } |
501 | 979 | /// Continue expression. | |
980 | /// | ||
981 | /// ``` | ||
982 | /// while bool_cond { | ||
983 | /// ❰ continue ❱; | ||
984 | /// } | ||
985 | /// | ||
986 | /// 'outer: loop { | ||
987 | /// loop { | ||
988 | /// ❰ continue 'outer ❱; | ||
989 | /// } | ||
990 | /// } | ||
991 | /// | ||
992 | /// ``` | ||
993 | /// | ||
994 | /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#continue-expressions) | ||
502 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 995 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
503 | pub struct ContinueExpr { | 996 | pub struct ContinueExpr { |
504 | pub(crate) syntax: SyntaxNode, | 997 | pub(crate) syntax: SyntaxNode, |
@@ -512,7 +1005,25 @@ impl ContinueExpr { | |||
512 | support::token(&self.syntax, T![lifetime]) | 1005 | support::token(&self.syntax, T![lifetime]) |
513 | } | 1006 | } |
514 | } | 1007 | } |
515 | 1008 | /// Break expression. | |
1009 | /// | ||
1010 | /// ``` | ||
1011 | /// while bool_cond { | ||
1012 | /// ❰ break ❱; | ||
1013 | /// } | ||
1014 | /// 'outer: loop { | ||
1015 | /// for foo in bar { | ||
1016 | /// ❰ break 'outer ❱; | ||
1017 | /// } | ||
1018 | /// } | ||
1019 | /// 'outer: loop { | ||
1020 | /// loop { | ||
1021 | /// ❰ break 'outer 42 ❱; | ||
1022 | /// } | ||
1023 | /// } | ||
1024 | /// ``` | ||
1025 | /// | ||
1026 | /// [Refernce](https://doc.rust-lang.org/reference/expressions/loop-expr.html#break-expressions) | ||
516 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1027 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
517 | pub struct BreakExpr { | 1028 | pub struct BreakExpr { |
518 | pub(crate) syntax: SyntaxNode, | 1029 | pub(crate) syntax: SyntaxNode, |
@@ -525,7 +1036,20 @@ impl BreakExpr { | |||
525 | } | 1036 | } |
526 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1037 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
527 | } | 1038 | } |
528 | 1039 | /// Label. | |
1040 | /// | ||
1041 | /// ``` | ||
1042 | /// ❰ 'outer: ❱ loop {} | ||
1043 | /// | ||
1044 | /// let foo = ❰ 'bar: ❱ loop {} | ||
1045 | /// | ||
1046 | /// ❰ 'baz: ❱ { | ||
1047 | /// break 'baz; | ||
1048 | /// } | ||
1049 | /// ``` | ||
1050 | /// | ||
1051 | /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html?highlight=label#loop-labels) | ||
1052 | /// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md) | ||
529 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1053 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
530 | pub struct Label { | 1054 | pub struct Label { |
531 | pub(crate) syntax: SyntaxNode, | 1055 | pub(crate) syntax: SyntaxNode, |
@@ -535,19 +1059,44 @@ impl Label { | |||
535 | support::token(&self.syntax, T![lifetime]) | 1059 | support::token(&self.syntax, T![lifetime]) |
536 | } | 1060 | } |
537 | } | 1061 | } |
538 | 1062 | /// Block expression. Includes unsafe blocks and block labels. | |
1063 | /// | ||
1064 | /// ``` | ||
1065 | /// let foo = ❰ | ||
1066 | /// { | ||
1067 | /// #![inner_attr] | ||
1068 | /// ❰ { } ❱ | ||
1069 | /// | ||
1070 | /// ❰ 'label: { break 'label } ❱ | ||
1071 | /// } | ||
1072 | /// ❱; | ||
1073 | /// ``` | ||
1074 | /// | ||
1075 | /// [Reference](https://doc.rust-lang.org/reference/expressions/block-expr.html) | ||
1076 | /// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md) | ||
539 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1077 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
540 | pub struct BlockExpr { | 1078 | pub struct BlockExpr { |
541 | pub(crate) syntax: SyntaxNode, | 1079 | pub(crate) syntax: SyntaxNode, |
542 | } | 1080 | } |
543 | impl ast::AttrsOwner for BlockExpr {} | 1081 | impl ast::AttrsOwner for BlockExpr {} |
1082 | impl ast::ModuleItemOwner for BlockExpr {} | ||
544 | impl BlockExpr { | 1083 | impl BlockExpr { |
545 | pub fn label(&self) -> Option<Label> { support::child(&self.syntax) } | 1084 | pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) } |
546 | pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) } | 1085 | pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) } |
547 | pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) } | 1086 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
548 | pub fn block(&self) -> Option<Block> { support::child(&self.syntax) } | 1087 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
549 | } | 1088 | } |
550 | 1089 | /// Return expression. | |
1090 | /// | ||
1091 | /// ``` | ||
1092 | /// || ❰ return 42 ❱; | ||
1093 | /// | ||
1094 | /// fn bar() { | ||
1095 | /// ❰ return ❱; | ||
1096 | /// } | ||
1097 | /// ``` | ||
1098 | /// | ||
1099 | /// [Reference](https://doc.rust-lang.org/reference/expressions/return-expr.html) | ||
551 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1100 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
552 | pub struct ReturnExpr { | 1101 | pub struct ReturnExpr { |
553 | pub(crate) syntax: SyntaxNode, | 1102 | pub(crate) syntax: SyntaxNode, |
@@ -556,7 +1105,16 @@ impl ast::AttrsOwner for ReturnExpr {} | |||
556 | impl ReturnExpr { | 1105 | impl ReturnExpr { |
557 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1106 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
558 | } | 1107 | } |
559 | 1108 | /// Call expression (not to be confused with method call expression, it is | |
1109 | /// a separate ast node). | ||
1110 | /// | ||
1111 | /// ``` | ||
1112 | /// ❰ foo() ❱; | ||
1113 | /// ❰ &str::len("bar") ❱; | ||
1114 | /// ❰ <&str as PartialEq<&str>>::eq(&"", &"") ❱; | ||
1115 | /// ``` | ||
1116 | /// | ||
1117 | /// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html) | ||
560 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1118 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
561 | pub struct CallExpr { | 1119 | pub struct CallExpr { |
562 | pub(crate) syntax: SyntaxNode, | 1120 | pub(crate) syntax: SyntaxNode, |
@@ -565,7 +1123,16 @@ impl ast::ArgListOwner for CallExpr {} | |||
565 | impl CallExpr { | 1123 | impl CallExpr { |
566 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1124 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
567 | } | 1125 | } |
568 | 1126 | /// Method call expression. | |
1127 | /// | ||
1128 | /// ``` | ||
1129 | /// ❰ receiver_expr.method() ❱; | ||
1130 | /// ❰ receiver_expr.method::<T>(42, true) ❱; | ||
1131 | /// | ||
1132 | /// ❰ ❰ ❰ foo.bar() ❱ .baz() ❱ .bruh() ❱; | ||
1133 | /// ``` | ||
1134 | /// | ||
1135 | /// [Reference](https://doc.rust-lang.org/reference/expressions/method-call-expr.html) | ||
569 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1136 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
570 | pub struct MethodCallExpr { | 1137 | pub struct MethodCallExpr { |
571 | pub(crate) syntax: SyntaxNode, | 1138 | pub(crate) syntax: SyntaxNode, |
@@ -578,7 +1145,13 @@ impl MethodCallExpr { | |||
578 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 1145 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
579 | pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) } | 1146 | pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) } |
580 | } | 1147 | } |
581 | 1148 | /// Index expression a.k.a. subscript operator call. | |
1149 | /// | ||
1150 | /// ``` | ||
1151 | /// ❰ foo[42] ❱; | ||
1152 | /// ``` | ||
1153 | /// | ||
1154 | /// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html) | ||
582 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1155 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
583 | pub struct IndexExpr { | 1156 | pub struct IndexExpr { |
584 | pub(crate) syntax: SyntaxNode, | 1157 | pub(crate) syntax: SyntaxNode, |
@@ -588,7 +1161,15 @@ impl IndexExpr { | |||
588 | pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) } | 1161 | pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) } |
589 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 1162 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
590 | } | 1163 | } |
591 | 1164 | /// Field access expression. | |
1165 | /// | ||
1166 | /// ``` | ||
1167 | /// ❰ expr.bar ❱; | ||
1168 | /// | ||
1169 | /// ❰ ❰ ❰ foo.bar ❱ .baz ❱ .bruh ❱; | ||
1170 | /// ``` | ||
1171 | /// | ||
1172 | /// [Reference](https://doc.rust-lang.org/reference/expressions/field-expr.html) | ||
592 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1173 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
593 | pub struct FieldExpr { | 1174 | pub struct FieldExpr { |
594 | pub(crate) syntax: SyntaxNode, | 1175 | pub(crate) syntax: SyntaxNode, |
@@ -599,7 +1180,13 @@ impl FieldExpr { | |||
599 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } | 1180 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } |
600 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 1181 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
601 | } | 1182 | } |
602 | 1183 | /// Await operator call expression. | |
1184 | /// | ||
1185 | /// ``` | ||
1186 | /// ❰ expr.await ❱; | ||
1187 | /// ``` | ||
1188 | /// | ||
1189 | /// [Reference](https://doc.rust-lang.org/reference/expressions/await-expr.html) | ||
603 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1190 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
604 | pub struct AwaitExpr { | 1191 | pub struct AwaitExpr { |
605 | pub(crate) syntax: SyntaxNode, | 1192 | pub(crate) syntax: SyntaxNode, |
@@ -610,17 +1197,29 @@ impl AwaitExpr { | |||
610 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } | 1197 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } |
611 | pub fn await_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![await]) } | 1198 | pub fn await_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![await]) } |
612 | } | 1199 | } |
613 | 1200 | /// The question mark operator call. | |
1201 | /// | ||
1202 | /// ``` | ||
1203 | /// ❰ expr? ❱; | ||
1204 | /// ``` | ||
1205 | /// | ||
1206 | /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#the-question-mark-operator) | ||
614 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1207 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
615 | pub struct TryExpr { | 1208 | pub struct TryExpr { |
616 | pub(crate) syntax: SyntaxNode, | 1209 | pub(crate) syntax: SyntaxNode, |
617 | } | 1210 | } |
618 | impl ast::AttrsOwner for TryExpr {} | 1211 | impl ast::AttrsOwner for TryExpr {} |
619 | impl TryExpr { | 1212 | impl TryExpr { |
620 | pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) } | ||
621 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1213 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
1214 | pub fn question_mark_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![?]) } | ||
622 | } | 1215 | } |
623 | 1216 | /// Type cast expression. | |
1217 | /// | ||
1218 | /// ``` | ||
1219 | /// ❰ expr as T ❱; | ||
1220 | /// ``` | ||
1221 | /// | ||
1222 | /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#type-cast-expressions) | ||
624 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1223 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
625 | pub struct CastExpr { | 1224 | pub struct CastExpr { |
626 | pub(crate) syntax: SyntaxNode, | 1225 | pub(crate) syntax: SyntaxNode, |
@@ -631,7 +1230,14 @@ impl CastExpr { | |||
631 | pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) } | 1230 | pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) } |
632 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 1231 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
633 | } | 1232 | } |
634 | 1233 | /// Borrow operator call. | |
1234 | /// | ||
1235 | /// ``` | ||
1236 | /// ❰ &foo ❱; | ||
1237 | /// ❰ &mut bar ❱; | ||
1238 | /// ``` | ||
1239 | /// | ||
1240 | /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#borrow-operators) | ||
635 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1241 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
636 | pub struct RefExpr { | 1242 | pub struct RefExpr { |
637 | pub(crate) syntax: SyntaxNode, | 1243 | pub(crate) syntax: SyntaxNode, |
@@ -643,7 +1249,15 @@ impl RefExpr { | |||
643 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } | 1249 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } |
644 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1250 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
645 | } | 1251 | } |
646 | 1252 | /// Prefix operator call. This is either `!` or `*` or `-`. | |
1253 | /// | ||
1254 | /// ``` | ||
1255 | /// ❰ !foo ❱; | ||
1256 | /// ❰ *bar ❱; | ||
1257 | /// ❰ -42 ❱; | ||
1258 | /// ``` | ||
1259 | /// | ||
1260 | /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html) | ||
647 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1261 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
648 | pub struct PrefixExpr { | 1262 | pub struct PrefixExpr { |
649 | pub(crate) syntax: SyntaxNode, | 1263 | pub(crate) syntax: SyntaxNode, |
@@ -652,7 +1266,13 @@ impl ast::AttrsOwner for PrefixExpr {} | |||
652 | impl PrefixExpr { | 1266 | impl PrefixExpr { |
653 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1267 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
654 | } | 1268 | } |
655 | 1269 | /// Box operator call. | |
1270 | /// | ||
1271 | /// ``` | ||
1272 | /// ❰ box 42 ❱; | ||
1273 | /// ``` | ||
1274 | /// | ||
1275 | /// [RFC](https://github.com/rust-lang/rfcs/blob/0806be4f282144cfcd55b1d20284b43f87cbe1c6/text/0809-box-and-in-for-stdlib.md) | ||
656 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1276 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
657 | pub struct BoxExpr { | 1277 | pub struct BoxExpr { |
658 | pub(crate) syntax: SyntaxNode, | 1278 | pub(crate) syntax: SyntaxNode, |
@@ -662,27 +1282,69 @@ impl BoxExpr { | |||
662 | pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) } | 1282 | pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) } |
663 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1283 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
664 | } | 1284 | } |
665 | 1285 | /// Range operator call. | |
1286 | /// | ||
1287 | /// ``` | ||
1288 | /// ❰ 0..42 ❱; | ||
1289 | /// ❰ ..42 ❱; | ||
1290 | /// ❰ 0.. ❱; | ||
1291 | /// ❰ .. ❱; | ||
1292 | /// ❰ 0..=42 ❱; | ||
1293 | /// ❰ ..=42 ❱; | ||
1294 | /// ``` | ||
1295 | /// | ||
1296 | /// [Reference](https://doc.rust-lang.org/reference/expressions/range-expr.html) | ||
666 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1297 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
667 | pub struct RangeExpr { | 1298 | pub struct RangeExpr { |
668 | pub(crate) syntax: SyntaxNode, | 1299 | pub(crate) syntax: SyntaxNode, |
669 | } | 1300 | } |
670 | impl ast::AttrsOwner for RangeExpr {} | 1301 | impl ast::AttrsOwner for RangeExpr {} |
671 | impl RangeExpr {} | 1302 | impl RangeExpr {} |
672 | 1303 | /// Binary operator call. | |
1304 | /// Includes all arithmetic, logic, bitwise and assignment operators. | ||
1305 | /// | ||
1306 | /// ``` | ||
1307 | /// ❰ 2 + ❰ 2 * 2 ❱ ❱; | ||
1308 | /// ❰ ❰ true && false ❱ || true ❱; | ||
1309 | /// ``` | ||
1310 | /// | ||
1311 | /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#arithmetic-and-logical-binary-operators) | ||
673 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1312 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
674 | pub struct BinExpr { | 1313 | pub struct BinExpr { |
675 | pub(crate) syntax: SyntaxNode, | 1314 | pub(crate) syntax: SyntaxNode, |
676 | } | 1315 | } |
677 | impl ast::AttrsOwner for BinExpr {} | 1316 | impl ast::AttrsOwner for BinExpr {} |
678 | impl BinExpr {} | 1317 | impl BinExpr {} |
679 | 1318 | /// [Raw] string, [raw] byte string, char, byte, integer, float or bool literal. | |
1319 | /// | ||
1320 | /// ``` | ||
1321 | /// ❰ "str" ❱; | ||
1322 | /// ❰ br##"raw byte str"## ❱; | ||
1323 | /// ❰ 'c' ❱; | ||
1324 | /// ❰ b'c' ❱; | ||
1325 | /// ❰ 42 ❱; | ||
1326 | /// ❰ 1e9 ❱; | ||
1327 | /// ❰ true ❱; | ||
1328 | /// ``` | ||
1329 | /// | ||
1330 | /// [Reference](https://doc.rust-lang.org/reference/expressions/literal-expr.html) | ||
680 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1331 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
681 | pub struct Literal { | 1332 | pub struct Literal { |
682 | pub(crate) syntax: SyntaxNode, | 1333 | pub(crate) syntax: SyntaxNode, |
683 | } | 1334 | } |
684 | impl Literal {} | 1335 | impl Literal {} |
685 | 1336 | /// Match expression. | |
1337 | /// | ||
1338 | /// ``` | ||
1339 | /// ❰ | ||
1340 | /// match expr { | ||
1341 | /// Pat1 => {} | ||
1342 | /// Pat2(_) => 42, | ||
1343 | /// } | ||
1344 | /// ❱ | ||
1345 | /// ``` | ||
1346 | /// | ||
1347 | /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html) | ||
686 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1348 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
687 | pub struct MatchExpr { | 1349 | pub struct MatchExpr { |
688 | pub(crate) syntax: SyntaxNode, | 1350 | pub(crate) syntax: SyntaxNode, |
@@ -693,7 +1355,20 @@ impl MatchExpr { | |||
693 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1355 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
694 | pub fn match_arm_list(&self) -> Option<MatchArmList> { support::child(&self.syntax) } | 1356 | pub fn match_arm_list(&self) -> Option<MatchArmList> { support::child(&self.syntax) } |
695 | } | 1357 | } |
696 | 1358 | /// Match arm list part of match expression. Includes its inner attributes. | |
1359 | /// | ||
1360 | /// ``` | ||
1361 | /// match expr | ||
1362 | /// ❰ | ||
1363 | /// { | ||
1364 | /// #![inner_attr] | ||
1365 | /// Pat1 => {} | ||
1366 | /// Pat2(_) => 42, | ||
1367 | /// } | ||
1368 | /// ❱ | ||
1369 | /// ``` | ||
1370 | /// | ||
1371 | /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html) | ||
697 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1372 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
698 | pub struct MatchArmList { | 1373 | pub struct MatchArmList { |
699 | pub(crate) syntax: SyntaxNode, | 1374 | pub(crate) syntax: SyntaxNode, |
@@ -704,7 +1379,16 @@ impl MatchArmList { | |||
704 | pub fn arms(&self) -> AstChildren<MatchArm> { support::children(&self.syntax) } | 1379 | pub fn arms(&self) -> AstChildren<MatchArm> { support::children(&self.syntax) } |
705 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 1380 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
706 | } | 1381 | } |
707 | 1382 | /// Match arm. | |
1383 | /// Note: record struct literals are not valid as target match expression | ||
1384 | /// due to ambiguity. | ||
1385 | /// ``` | ||
1386 | /// match expr { | ||
1387 | /// ❰ #[attr] Pattern(it) if bool_cond => it ❱, | ||
1388 | /// } | ||
1389 | /// ``` | ||
1390 | /// | ||
1391 | /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html) | ||
708 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1392 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
709 | pub struct MatchArm { | 1393 | pub struct MatchArm { |
710 | pub(crate) syntax: SyntaxNode, | 1394 | pub(crate) syntax: SyntaxNode, |
@@ -716,7 +1400,15 @@ impl MatchArm { | |||
716 | pub fn fat_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=>]) } | 1400 | pub fn fat_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=>]) } |
717 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1401 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
718 | } | 1402 | } |
719 | 1403 | /// Match guard. | |
1404 | /// | ||
1405 | /// ``` | ||
1406 | /// match expr { | ||
1407 | /// Pattern(it) ❰ if bool_cond ❱ => it, | ||
1408 | /// } | ||
1409 | /// ``` | ||
1410 | /// | ||
1411 | /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html#match-guards) | ||
720 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1412 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
721 | pub struct MatchGuard { | 1413 | pub struct MatchGuard { |
722 | pub(crate) syntax: SyntaxNode, | 1414 | pub(crate) syntax: SyntaxNode, |
@@ -725,7 +1417,21 @@ impl MatchGuard { | |||
725 | pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) } | 1417 | pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) } |
726 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1418 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
727 | } | 1419 | } |
728 | 1420 | /// Record literal expression. The same syntax is used for structs, | |
1421 | /// unions and record enum variants. | ||
1422 | /// | ||
1423 | /// ``` | ||
1424 | /// ❰ | ||
1425 | /// foo::Bar { | ||
1426 | /// #![inner_attr] | ||
1427 | /// baz: 42, | ||
1428 | /// bruh: true, | ||
1429 | /// ..spread | ||
1430 | /// } | ||
1431 | /// ❱ | ||
1432 | /// ``` | ||
1433 | /// | ||
1434 | /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html) | ||
729 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1435 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
730 | pub struct RecordLit { | 1436 | pub struct RecordLit { |
731 | pub(crate) syntax: SyntaxNode, | 1437 | pub(crate) syntax: SyntaxNode, |
@@ -734,7 +1440,16 @@ impl RecordLit { | |||
734 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 1440 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
735 | pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) } | 1441 | pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) } |
736 | } | 1442 | } |
737 | 1443 | /// Record field list including enclosing curly braces. | |
1444 | /// | ||
1445 | /// foo::Bar ❰ | ||
1446 | /// { | ||
1447 | /// baz: 42, | ||
1448 | /// ..spread | ||
1449 | /// } | ||
1450 | /// ❱ | ||
1451 | /// | ||
1452 | /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html) | ||
738 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1453 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
739 | pub struct RecordFieldList { | 1454 | pub struct RecordFieldList { |
740 | pub(crate) syntax: SyntaxNode, | 1455 | pub(crate) syntax: SyntaxNode, |
@@ -746,7 +1461,15 @@ impl RecordFieldList { | |||
746 | pub fn spread(&self) -> Option<Expr> { support::child(&self.syntax) } | 1461 | pub fn spread(&self) -> Option<Expr> { support::child(&self.syntax) } |
747 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 1462 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
748 | } | 1463 | } |
749 | 1464 | /// Record field. | |
1465 | /// | ||
1466 | /// ``` | ||
1467 | /// foo::Bar { | ||
1468 | /// ❰ #[attr] baz: 42 ❱ | ||
1469 | /// } | ||
1470 | /// ``` | ||
1471 | /// | ||
1472 | /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html) | ||
750 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1473 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
751 | pub struct RecordField { | 1474 | pub struct RecordField { |
752 | pub(crate) syntax: SyntaxNode, | 1475 | pub(crate) syntax: SyntaxNode, |
@@ -757,7 +1480,13 @@ impl RecordField { | |||
757 | pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) } | 1480 | pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) } |
758 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 1481 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
759 | } | 1482 | } |
760 | 1483 | /// Disjunction of patterns. | |
1484 | /// | ||
1485 | /// ``` | ||
1486 | /// let ❰ Foo(it) | Bar(it) | Baz(it) ❱ = bruh; | ||
1487 | /// ``` | ||
1488 | /// | ||
1489 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html) | ||
761 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1490 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
762 | pub struct OrPat { | 1491 | pub struct OrPat { |
763 | pub(crate) syntax: SyntaxNode, | 1492 | pub(crate) syntax: SyntaxNode, |
@@ -765,7 +1494,14 @@ pub struct OrPat { | |||
765 | impl OrPat { | 1494 | impl OrPat { |
766 | pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1495 | pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
767 | } | 1496 | } |
768 | 1497 | /// Parenthesized pattern. | |
1498 | /// Note: parens are only used for grouping, this is not a tuple pattern. | ||
1499 | /// | ||
1500 | /// ``` | ||
1501 | /// if let ❰ &(0..=42) ❱ = foo {} | ||
1502 | /// ``` | ||
1503 | /// | ||
1504 | /// https://doc.rust-lang.org/reference/patterns.html#grouped-patterns | ||
769 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1505 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
770 | pub struct ParenPat { | 1506 | pub struct ParenPat { |
771 | pub(crate) syntax: SyntaxNode, | 1507 | pub(crate) syntax: SyntaxNode, |
@@ -775,7 +1511,16 @@ impl ParenPat { | |||
775 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 1511 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
776 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 1512 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
777 | } | 1513 | } |
778 | 1514 | /// Reference pattern. | |
1515 | /// Note: this has nothing to do with `ref` keyword, the latter is used in bind patterns. | ||
1516 | /// | ||
1517 | /// ``` | ||
1518 | /// let ❰ &mut foo ❱ = bar; | ||
1519 | /// | ||
1520 | /// let ❰ & ❰ &mut ❰ &_ ❱ ❱ ❱ = baz; | ||
1521 | /// ``` | ||
1522 | /// | ||
1523 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#reference-patterns) | ||
779 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1524 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
780 | pub struct RefPat { | 1525 | pub struct RefPat { |
781 | pub(crate) syntax: SyntaxNode, | 1526 | pub(crate) syntax: SyntaxNode, |
@@ -785,7 +1530,13 @@ impl RefPat { | |||
785 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } | 1530 | pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) } |
786 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 1531 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
787 | } | 1532 | } |
788 | 1533 | /// Box pattern. | |
1534 | /// | ||
1535 | /// ``` | ||
1536 | /// let ❰ box foo ❱ = box 42; | ||
1537 | /// ``` | ||
1538 | /// | ||
1539 | /// [Unstable book](https://doc.rust-lang.org/unstable-book/language-features/box-patterns.html) | ||
789 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1540 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
790 | pub struct BoxPat { | 1541 | pub struct BoxPat { |
791 | pub(crate) syntax: SyntaxNode, | 1542 | pub(crate) syntax: SyntaxNode, |
@@ -794,7 +1545,16 @@ impl BoxPat { | |||
794 | pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) } | 1545 | pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) } |
795 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 1546 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
796 | } | 1547 | } |
797 | 1548 | /// Bind pattern. | |
1549 | /// | ||
1550 | /// ``` | ||
1551 | /// match foo { | ||
1552 | /// Some(❰ ref mut bar ❱) => {} | ||
1553 | /// ❰ baz @ None ❱ => {} | ||
1554 | /// } | ||
1555 | /// ``` | ||
1556 | /// | ||
1557 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#identifier-patterns) | ||
798 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1558 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
799 | pub struct BindPat { | 1559 | pub struct BindPat { |
800 | pub(crate) syntax: SyntaxNode, | 1560 | pub(crate) syntax: SyntaxNode, |
@@ -807,7 +1567,13 @@ impl BindPat { | |||
807 | pub fn at_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![@]) } | 1567 | pub fn at_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![@]) } |
808 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 1568 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
809 | } | 1569 | } |
810 | 1570 | /// Placeholder pattern a.k.a. the wildcard pattern or the underscore. | |
1571 | /// | ||
1572 | /// ``` | ||
1573 | /// let ❰ _ ❱ = foo; | ||
1574 | /// ``` | ||
1575 | /// | ||
1576 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#wildcard-pattern) | ||
811 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1577 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
812 | pub struct PlaceholderPat { | 1578 | pub struct PlaceholderPat { |
813 | pub(crate) syntax: SyntaxNode, | 1579 | pub(crate) syntax: SyntaxNode, |
@@ -815,7 +1581,16 @@ pub struct PlaceholderPat { | |||
815 | impl PlaceholderPat { | 1581 | impl PlaceholderPat { |
816 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } | 1582 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } |
817 | } | 1583 | } |
818 | 1584 | /// Rest-of-the record/tuple pattern. | |
1585 | /// Note: this is not the unbonded range pattern (even more: it doesn't exist). | ||
1586 | /// | ||
1587 | /// ``` | ||
1588 | /// let Foo { bar, ❰ .. ❱ } = baz; | ||
1589 | /// let (❰ .. ❱, bruh) = (42, 24, 42); | ||
1590 | /// let Bruuh(❰ .. ❱) = bruuuh; | ||
1591 | /// ``` | ||
1592 | /// | ||
1593 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns) | ||
819 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1594 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
820 | pub struct DotDotPat { | 1595 | pub struct DotDotPat { |
821 | pub(crate) syntax: SyntaxNode, | 1596 | pub(crate) syntax: SyntaxNode, |
@@ -823,7 +1598,15 @@ pub struct DotDotPat { | |||
823 | impl DotDotPat { | 1598 | impl DotDotPat { |
824 | pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) } | 1599 | pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) } |
825 | } | 1600 | } |
826 | 1601 | /// Path pattern. | |
1602 | /// Doesn't include the underscore pattern (it is a special case, namely `PlaceholderPat`). | ||
1603 | /// | ||
1604 | /// ``` | ||
1605 | /// let ❰ foo::bar::Baz ❱ { .. } = bruh; | ||
1606 | /// if let ❰ CONST ❱ = 42 {} | ||
1607 | /// ``` | ||
1608 | /// | ||
1609 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#path-patterns) | ||
827 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1610 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
828 | pub struct PathPat { | 1611 | pub struct PathPat { |
829 | pub(crate) syntax: SyntaxNode, | 1612 | pub(crate) syntax: SyntaxNode, |
@@ -831,7 +1614,13 @@ pub struct PathPat { | |||
831 | impl PathPat { | 1614 | impl PathPat { |
832 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 1615 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
833 | } | 1616 | } |
834 | 1617 | /// Slice pattern. | |
1618 | /// | ||
1619 | /// ``` | ||
1620 | /// let ❰ [foo, bar, baz] ❱ = [1, 2, 3]; | ||
1621 | /// ``` | ||
1622 | /// | ||
1623 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#slice-patterns) | ||
835 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1624 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
836 | pub struct SlicePat { | 1625 | pub struct SlicePat { |
837 | pub(crate) syntax: SyntaxNode, | 1626 | pub(crate) syntax: SyntaxNode, |
@@ -841,13 +1630,33 @@ impl SlicePat { | |||
841 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1630 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
842 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 1631 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
843 | } | 1632 | } |
844 | 1633 | /// Range pattern. | |
1634 | /// | ||
1635 | /// ``` | ||
1636 | /// match foo { | ||
1637 | /// ❰ 0..42 ❱ => {} | ||
1638 | /// ❰ 0..=42 ❱ => {} | ||
1639 | /// } | ||
1640 | /// ``` | ||
1641 | /// | ||
1642 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#range-patterns) | ||
845 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1643 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
846 | pub struct RangePat { | 1644 | pub struct RangePat { |
847 | pub(crate) syntax: SyntaxNode, | 1645 | pub(crate) syntax: SyntaxNode, |
848 | } | 1646 | } |
849 | impl RangePat {} | 1647 | impl RangePat {} |
850 | 1648 | /// Literal pattern. | |
1649 | /// Includes only bool, number, char, and string literals. | ||
1650 | /// | ||
1651 | /// ``` | ||
1652 | /// match foo { | ||
1653 | /// Number(❰ 42 ❱) => {} | ||
1654 | /// String(❰ "42" ❱) => {} | ||
1655 | /// Bool(❰ true ❱) => {} | ||
1656 | /// } | ||
1657 | /// ``` | ||
1658 | /// | ||
1659 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#literal-patterns) | ||
851 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1660 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
852 | pub struct LiteralPat { | 1661 | pub struct LiteralPat { |
853 | pub(crate) syntax: SyntaxNode, | 1662 | pub(crate) syntax: SyntaxNode, |
@@ -855,7 +1664,13 @@ pub struct LiteralPat { | |||
855 | impl LiteralPat { | 1664 | impl LiteralPat { |
856 | pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) } | 1665 | pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) } |
857 | } | 1666 | } |
858 | 1667 | /// Macro invocation in pattern position. | |
1668 | /// | ||
1669 | /// ``` | ||
1670 | /// let ❰ foo!(my custom syntax) ❱ = baz; | ||
1671 | /// | ||
1672 | /// ``` | ||
1673 | /// [Reference](https://doc.rust-lang.org/reference/macros.html#macro-invocation) | ||
859 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1674 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
860 | pub struct MacroPat { | 1675 | pub struct MacroPat { |
861 | pub(crate) syntax: SyntaxNode, | 1676 | pub(crate) syntax: SyntaxNode, |
@@ -863,7 +1678,13 @@ pub struct MacroPat { | |||
863 | impl MacroPat { | 1678 | impl MacroPat { |
864 | pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) } | 1679 | pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) } |
865 | } | 1680 | } |
866 | 1681 | /// Record literal pattern. | |
1682 | /// | ||
1683 | /// ``` | ||
1684 | /// let ❰ foo::Bar { baz, .. } ❱ = bruh; | ||
1685 | /// ``` | ||
1686 | /// | ||
1687 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns) | ||
867 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1688 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
868 | pub struct RecordPat { | 1689 | pub struct RecordPat { |
869 | pub(crate) syntax: SyntaxNode, | 1690 | pub(crate) syntax: SyntaxNode, |
@@ -874,7 +1695,13 @@ impl RecordPat { | |||
874 | } | 1695 | } |
875 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 1696 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
876 | } | 1697 | } |
877 | 1698 | /// Record literal's field patterns list including enclosing curly braces. | |
1699 | /// | ||
1700 | /// ``` | ||
1701 | /// let foo::Bar ❰ { baz, bind @ bruh, .. } ❱ = bruuh; | ||
1702 | /// `` | ||
1703 | /// | ||
1704 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns) | ||
878 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1705 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
879 | pub struct RecordFieldPatList { | 1706 | pub struct RecordFieldPatList { |
880 | pub(crate) syntax: SyntaxNode, | 1707 | pub(crate) syntax: SyntaxNode, |
@@ -889,7 +1716,15 @@ impl RecordFieldPatList { | |||
889 | pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) } | 1716 | pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) } |
890 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 1717 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
891 | } | 1718 | } |
892 | 1719 | /// Record literal's field pattern. | |
1720 | /// Note: record literal can also match tuple structs. | ||
1721 | /// | ||
1722 | /// ``` | ||
1723 | /// let Foo { ❰ bar: _ ❱ } = baz; | ||
1724 | /// let TupleStruct { ❰ 0: _ ❱ } = bruh; | ||
1725 | /// ``` | ||
1726 | /// | ||
1727 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns) | ||
893 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1728 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
894 | pub struct RecordFieldPat { | 1729 | pub struct RecordFieldPat { |
895 | pub(crate) syntax: SyntaxNode, | 1730 | pub(crate) syntax: SyntaxNode, |
@@ -900,7 +1735,13 @@ impl RecordFieldPat { | |||
900 | pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) } | 1735 | pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) } |
901 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 1736 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
902 | } | 1737 | } |
903 | 1738 | /// Tuple struct literal pattern. | |
1739 | /// | ||
1740 | /// ``` | ||
1741 | /// let ❰ foo::Bar(baz, bruh) ❱ = bruuh; | ||
1742 | /// ``` | ||
1743 | /// | ||
1744 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-struct-patterns) | ||
904 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1745 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
905 | pub struct TupleStructPat { | 1746 | pub struct TupleStructPat { |
906 | pub(crate) syntax: SyntaxNode, | 1747 | pub(crate) syntax: SyntaxNode, |
@@ -911,7 +1752,14 @@ impl TupleStructPat { | |||
911 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1752 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
912 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 1753 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
913 | } | 1754 | } |
914 | 1755 | /// Tuple pattern. | |
1756 | /// Note: this doesn't include tuple structs (see `TupleStructPat`) | ||
1757 | /// | ||
1758 | /// ``` | ||
1759 | /// let ❰ (foo, bar, .., baz) ❱ = bruh; | ||
1760 | /// ``` | ||
1761 | /// | ||
1762 | /// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-patterns) | ||
915 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1763 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
916 | pub struct TuplePat { | 1764 | pub struct TuplePat { |
917 | pub(crate) syntax: SyntaxNode, | 1765 | pub(crate) syntax: SyntaxNode, |
@@ -921,7 +1769,17 @@ impl TuplePat { | |||
921 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1769 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
922 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 1770 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
923 | } | 1771 | } |
924 | 1772 | /// Visibility. | |
1773 | /// | ||
1774 | /// ``` | ||
1775 | /// ❰ pub mod ❱ foo; | ||
1776 | /// ❰ pub(crate) ❱ struct Bar; | ||
1777 | /// ❰ pub(self) ❱ enum Baz {} | ||
1778 | /// ❰ pub(super) ❱ fn bruh() {} | ||
1779 | /// ❰ pub(in bruuh::bruuuh) ❱ type T = u64; | ||
1780 | /// ``` | ||
1781 | /// | ||
1782 | /// [Reference](https://doc.rust-lang.org/reference/visibility-and-privacy.html) | ||
925 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1783 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
926 | pub struct Visibility { | 1784 | pub struct Visibility { |
927 | pub(crate) syntax: SyntaxNode, | 1785 | pub(crate) syntax: SyntaxNode, |
@@ -932,7 +1790,29 @@ impl Visibility { | |||
932 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } | 1790 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } |
933 | pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) } | 1791 | pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) } |
934 | } | 1792 | } |
935 | 1793 | /// Single identifier. | |
1794 | /// Note(@matklad): `Name` is for things that install a new name into the scope, | ||
1795 | /// `NameRef` is a usage of a name. Most of the time, this definition/reference | ||
1796 | /// distinction can be determined purely syntactically, ie in | ||
1797 | /// ``` | ||
1798 | /// fn foo() { foo() } | ||
1799 | /// ``` | ||
1800 | /// the first foo is `Name`, the second one is `NameRef`. | ||
1801 | /// The notable exception are patterns, where in | ||
1802 | /// `` | ||
1803 | /// let x = 92 | ||
1804 | /// ``` | ||
1805 | /// `x` can be semantically either a name or a name ref, depeding on | ||
1806 | /// wether there's an `x` constant in scope. | ||
1807 | /// We use `Name` for patterns, and disambiguate semantically (see `NameClass` in ide_db). | ||
1808 | /// | ||
1809 | /// ``` | ||
1810 | /// let ❰ foo ❱ = bar; | ||
1811 | /// struct ❰ Baz ❱; | ||
1812 | /// fn ❰ bruh ❱() {} | ||
1813 | /// ``` | ||
1814 | /// | ||
1815 | /// [Reference](https://doc.rust-lang.org/reference/identifiers.html) | ||
936 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1816 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
937 | pub struct Name { | 1817 | pub struct Name { |
938 | pub(crate) syntax: SyntaxNode, | 1818 | pub(crate) syntax: SyntaxNode, |
@@ -940,13 +1820,41 @@ pub struct Name { | |||
940 | impl Name { | 1820 | impl Name { |
941 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } | 1821 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } |
942 | } | 1822 | } |
943 | 1823 | /// Reference to a name. | |
1824 | /// See the explanation on the difference between `Name` and `NameRef` | ||
1825 | /// in `Name` ast node docs. | ||
1826 | /// | ||
1827 | /// ``` | ||
1828 | /// let foo = ❰ bar ❱(❰ Baz(❰ bruh ❱) ❱; | ||
1829 | /// ``` | ||
1830 | /// | ||
1831 | /// [Reference](https://doc.rust-lang.org/reference/identifiers.html) | ||
944 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1832 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
945 | pub struct NameRef { | 1833 | pub struct NameRef { |
946 | pub(crate) syntax: SyntaxNode, | 1834 | pub(crate) syntax: SyntaxNode, |
947 | } | 1835 | } |
948 | impl NameRef {} | 1836 | impl NameRef {} |
949 | 1837 | /// Macro call. | |
1838 | /// Includes all of its attributes and doc comments. | ||
1839 | /// | ||
1840 | /// ``` | ||
1841 | /// ❰ | ||
1842 | /// /// Docs | ||
1843 | /// #[attr] | ||
1844 | /// macro_rules! foo { // macro rules is also a macro call | ||
1845 | /// ($bar: tt) => {} | ||
1846 | /// } | ||
1847 | /// ❱ | ||
1848 | /// | ||
1849 | /// // semicolon is a part of `MacroCall` when it is used in item positions | ||
1850 | /// ❰ foo!(); ❱ | ||
1851 | /// | ||
1852 | /// fn main() { | ||
1853 | /// ❰ foo!() ❱; // macro call in expression positions doesn't include the semi | ||
1854 | /// } | ||
1855 | /// ``` | ||
1856 | /// | ||
1857 | /// [Reference](https://doc.rust-lang.org/reference/macros.html) | ||
950 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1858 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
951 | pub struct MacroCall { | 1859 | pub struct MacroCall { |
952 | pub(crate) syntax: SyntaxNode, | 1860 | pub(crate) syntax: SyntaxNode, |
@@ -960,7 +1868,18 @@ impl MacroCall { | |||
960 | pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) } | 1868 | pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) } |
961 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 1869 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
962 | } | 1870 | } |
963 | 1871 | /// Attribute. | |
1872 | /// | ||
1873 | /// ``` | ||
1874 | /// ❰ #![inner_attr] ❱ | ||
1875 | /// | ||
1876 | /// ❰ #[attr] ❱ | ||
1877 | /// ❰ #[foo = "bar"] ❱ | ||
1878 | /// ❰ #[baz(bruh::bruuh = "42")] ❱ | ||
1879 | /// struct Foo; | ||
1880 | /// ``` | ||
1881 | /// | ||
1882 | /// [Reference](https://doc.rust-lang.org/reference/attributes.html) | ||
964 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1883 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
965 | pub struct Attr { | 1884 | pub struct Attr { |
966 | pub(crate) syntax: SyntaxNode, | 1885 | pub(crate) syntax: SyntaxNode, |
@@ -974,13 +1893,32 @@ impl Attr { | |||
974 | pub fn input(&self) -> Option<AttrInput> { support::child(&self.syntax) } | 1893 | pub fn input(&self) -> Option<AttrInput> { support::child(&self.syntax) } |
975 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 1894 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
976 | } | 1895 | } |
977 | 1896 | /// Stores a list of lexer tokens and other `TokenTree`s. | |
1897 | /// It appears in attributes, macro_rules and macro call (foo!) | ||
1898 | /// | ||
1899 | /// ``` | ||
1900 | /// macro_call! ❰ { my syntax here } ❱; | ||
1901 | /// ``` | ||
1902 | /// | ||
1903 | /// [Reference](https://doc.rust-lang.org/reference/macros.html) | ||
978 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1904 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
979 | pub struct TokenTree { | 1905 | pub struct TokenTree { |
980 | pub(crate) syntax: SyntaxNode, | 1906 | pub(crate) syntax: SyntaxNode, |
981 | } | 1907 | } |
982 | impl TokenTree {} | 1908 | impl TokenTree {} |
983 | 1909 | /// Generic lifetime, type and constants parameters list **declaration**. | |
1910 | /// | ||
1911 | /// ``` | ||
1912 | /// fn foo❰ <'a, 'b, T, U, const BAR: u64> ❱() {} | ||
1913 | /// | ||
1914 | /// struct Baz❰ <T> ❱(T); | ||
1915 | /// | ||
1916 | /// impl❰ <T> ❱ Bruh<T> {} | ||
1917 | /// | ||
1918 | /// type Bruuh = for❰ <'a> ❱ fn(&'a str) -> &'a str; | ||
1919 | /// ``` | ||
1920 | /// | ||
1921 | /// [Reference](https://doc.rust-lang.org/reference/items/generics.html) | ||
984 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1922 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
985 | pub struct TypeParamList { | 1923 | pub struct TypeParamList { |
986 | pub(crate) syntax: SyntaxNode, | 1924 | pub(crate) syntax: SyntaxNode, |
@@ -993,7 +1931,13 @@ impl TypeParamList { | |||
993 | pub fn const_params(&self) -> AstChildren<ConstParam> { support::children(&self.syntax) } | 1931 | pub fn const_params(&self) -> AstChildren<ConstParam> { support::children(&self.syntax) } |
994 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } | 1932 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } |
995 | } | 1933 | } |
996 | 1934 | /// Single type parameter **declaration**. | |
1935 | /// | ||
1936 | /// ``` | ||
1937 | /// fn foo<❰ K ❱, ❰ I ❱, ❰ E: Debug ❱, ❰ V = DefaultType ❱>() {} | ||
1938 | /// ``` | ||
1939 | /// | ||
1940 | /// [Reference](https://doc.rust-lang.org/reference/items/generics.html) | ||
997 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1941 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
998 | pub struct TypeParam { | 1942 | pub struct TypeParam { |
999 | pub(crate) syntax: SyntaxNode, | 1943 | pub(crate) syntax: SyntaxNode, |
@@ -1005,7 +1949,12 @@ impl TypeParam { | |||
1005 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | 1949 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } |
1006 | pub fn default_type(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 1950 | pub fn default_type(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
1007 | } | 1951 | } |
1008 | 1952 | /// Const generic parameter **declaration**. | |
1953 | /// ``` | ||
1954 | /// fn foo<T, U, ❰ const BAR: usize ❱, ❰ const BAZ: bool ❱>() {} | ||
1955 | /// ``` | ||
1956 | /// | ||
1957 | /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter) | ||
1009 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1958 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1010 | pub struct ConstParam { | 1959 | pub struct ConstParam { |
1011 | pub(crate) syntax: SyntaxNode, | 1960 | pub(crate) syntax: SyntaxNode, |
@@ -1017,7 +1966,13 @@ impl ConstParam { | |||
1017 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | 1966 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } |
1018 | pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) } | 1967 | pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) } |
1019 | } | 1968 | } |
1020 | 1969 | /// Lifetime parameter **declaration**. | |
1970 | /// | ||
1971 | /// ``` | ||
1972 | /// fn foo<❰ 'a ❱, ❰ 'b ❱, V, G, D>(bar: &'a str, baz: &'b mut str) {} | ||
1973 | /// ``` | ||
1974 | /// | ||
1975 | /// [Reference](https://doc.rust-lang.org/reference/items/generics.html) | ||
1021 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1976 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1022 | pub struct LifetimeParam { | 1977 | pub struct LifetimeParam { |
1023 | pub(crate) syntax: SyntaxNode, | 1978 | pub(crate) syntax: SyntaxNode, |
@@ -1028,7 +1983,20 @@ impl LifetimeParam { | |||
1028 | support::token(&self.syntax, T![lifetime]) | 1983 | support::token(&self.syntax, T![lifetime]) |
1029 | } | 1984 | } |
1030 | } | 1985 | } |
1031 | 1986 | /// Type bound declaration clause. | |
1987 | /// | ||
1988 | /// ``` | ||
1989 | /// fn foo<T: ❰ ?Sized ❱ + ❰ Debug ❱>() {} | ||
1990 | /// | ||
1991 | /// trait Bar<T> | ||
1992 | /// where | ||
1993 | /// T: ❰ Send ❱ + ❰ Sync ❱ | ||
1994 | /// { | ||
1995 | /// type Baz: ❰ !Sync ❱ + ❰ Debug ❱ + ❰ ?const Add ❱; | ||
1996 | /// } | ||
1997 | /// ``` | ||
1998 | /// | ||
1999 | /// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html) | ||
1032 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2000 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1033 | pub struct TypeBound { | 2001 | pub struct TypeBound { |
1034 | pub(crate) syntax: SyntaxNode, | 2002 | pub(crate) syntax: SyntaxNode, |
@@ -1040,7 +2008,21 @@ impl TypeBound { | |||
1040 | pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) } | 2008 | pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) } |
1041 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 2009 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
1042 | } | 2010 | } |
1043 | 2011 | /// Type bounds list. | |
2012 | /// | ||
2013 | /// ``` | ||
2014 | /// | ||
2015 | /// fn foo<T: ❰ ?Sized + Debug ❱>() {} | ||
2016 | /// | ||
2017 | /// trait Bar<T> | ||
2018 | /// where | ||
2019 | /// T: ❰ Send + Sync ❱ | ||
2020 | /// { | ||
2021 | /// type Baz: ❰ !Sync + Debug ❱; | ||
2022 | /// } | ||
2023 | /// ``` | ||
2024 | /// | ||
2025 | /// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html) | ||
1044 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2026 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1045 | pub struct TypeBoundList { | 2027 | pub struct TypeBoundList { |
1046 | pub(crate) syntax: SyntaxNode, | 2028 | pub(crate) syntax: SyntaxNode, |
@@ -1048,7 +2030,18 @@ pub struct TypeBoundList { | |||
1048 | impl TypeBoundList { | 2030 | impl TypeBoundList { |
1049 | pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) } | 2031 | pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) } |
1050 | } | 2032 | } |
1051 | 2033 | /// Single where predicate. | |
2034 | /// | ||
2035 | /// ``` | ||
2036 | /// trait Foo<'a, 'b, T> | ||
2037 | /// where | ||
2038 | /// ❰ 'a: 'b ❱, | ||
2039 | /// ❰ T: IntoIterator ❱, | ||
2040 | /// ❰ for<'c> <T as IntoIterator>::Item: Bar<'c> ❱ | ||
2041 | /// {} | ||
2042 | /// ``` | ||
2043 | /// | ||
2044 | /// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses) | ||
1052 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2045 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1053 | pub struct WherePred { | 2046 | pub struct WherePred { |
1054 | pub(crate) syntax: SyntaxNode, | 2047 | pub(crate) syntax: SyntaxNode, |
@@ -1060,7 +2053,14 @@ impl WherePred { | |||
1060 | } | 2053 | } |
1061 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 2054 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
1062 | } | 2055 | } |
1063 | 2056 | /// Where clause. | |
2057 | /// | ||
2058 | /// ``` | ||
2059 | /// trait Foo<'a, T> ❰ where 'a: 'static, T: Debug ❱ {} | ||
2060 | /// | ||
2061 | /// ``` | ||
2062 | /// | ||
2063 | /// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses) | ||
1064 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2064 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1065 | pub struct WhereClause { | 2065 | pub struct WhereClause { |
1066 | pub(crate) syntax: SyntaxNode, | 2066 | pub(crate) syntax: SyntaxNode, |
@@ -1069,13 +2069,42 @@ impl WhereClause { | |||
1069 | pub fn where_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![where]) } | 2069 | pub fn where_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![where]) } |
1070 | pub fn predicates(&self) -> AstChildren<WherePred> { support::children(&self.syntax) } | 2070 | pub fn predicates(&self) -> AstChildren<WherePred> { support::children(&self.syntax) } |
1071 | } | 2071 | } |
1072 | 2072 | /// Abi declaration. | |
2073 | /// Note: the abi string is optional. | ||
2074 | /// | ||
2075 | /// ``` | ||
2076 | /// ❰ extern "C" ❱ { | ||
2077 | /// fn foo() {} | ||
2078 | /// } | ||
2079 | /// | ||
2080 | /// type Bar = ❰ extern ❱ fn() -> u32; | ||
2081 | /// | ||
2082 | /// type Baz = ❰ extern r#"stdcall"# ❱ fn() -> bool; | ||
2083 | /// ``` | ||
2084 | /// | ||
2085 | /// - [Extern blocks reference](https://doc.rust-lang.org/reference/items/external-blocks.html) | ||
2086 | /// - [FFI function pointers reference](https://doc.rust-lang.org/reference/items/functions.html#functions) | ||
1073 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2087 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1074 | pub struct Abi { | 2088 | pub struct Abi { |
1075 | pub(crate) syntax: SyntaxNode, | 2089 | pub(crate) syntax: SyntaxNode, |
1076 | } | 2090 | } |
1077 | impl Abi {} | 2091 | impl Abi {} |
1078 | 2092 | /// Expression statement. | |
2093 | /// | ||
2094 | /// ``` | ||
2095 | /// ❰ 42; ❱ | ||
2096 | /// ❰ foo(); ❱ | ||
2097 | /// ❰ (); ❱ | ||
2098 | /// ❰ {}; ❱ | ||
2099 | /// | ||
2100 | /// // constructions with trailing curly brace can omit the semicolon | ||
2101 | /// // but only when there are satements immediately after them (this is important!) | ||
2102 | /// ❰ if bool_cond { } ❱ | ||
2103 | /// ❰ loop {} ❱ | ||
2104 | /// ❰ somestatment; ❱ | ||
2105 | /// ``` | ||
2106 | /// | ||
2107 | /// [Reference](https://doc.rust-lang.org/reference/statements.html) | ||
1079 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2108 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1080 | pub struct ExprStmt { | 2109 | pub struct ExprStmt { |
1081 | pub(crate) syntax: SyntaxNode, | 2110 | pub(crate) syntax: SyntaxNode, |
@@ -1085,7 +2114,16 @@ impl ExprStmt { | |||
1085 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 2114 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
1086 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 2115 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
1087 | } | 2116 | } |
1088 | 2117 | /// Let statement. | |
2118 | /// | ||
2119 | /// ``` | ||
2120 | /// ❰ #[attr] let foo; ❱ | ||
2121 | /// ❰ let bar: u64; ❱ | ||
2122 | /// ❰ let baz = 42; ❱ | ||
2123 | /// ❰ let bruh: bool = true; ❱ | ||
2124 | /// ``` | ||
2125 | /// | ||
2126 | /// [Reference](https://doc.rust-lang.org/reference/statements.html#let-statements) | ||
1089 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2127 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1090 | pub struct LetStmt { | 2128 | pub struct LetStmt { |
1091 | pub(crate) syntax: SyntaxNode, | 2129 | pub(crate) syntax: SyntaxNode, |
@@ -1099,7 +2137,18 @@ impl LetStmt { | |||
1099 | pub fn initializer(&self) -> Option<Expr> { support::child(&self.syntax) } | 2137 | pub fn initializer(&self) -> Option<Expr> { support::child(&self.syntax) } |
1100 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } | 2138 | pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) } |
1101 | } | 2139 | } |
1102 | 2140 | /// Condition of `if` or `while` expression. | |
2141 | /// | ||
2142 | /// ``` | ||
2143 | /// if ❰ true ❱ {} | ||
2144 | /// if ❰ let Pat(foo) = bar ❱ {} | ||
2145 | /// | ||
2146 | /// while ❰ true ❱ {} | ||
2147 | /// while ❰ let Pat(baz) = bruh ❱ {} | ||
2148 | /// ``` | ||
2149 | /// | ||
2150 | /// [If expression reference](https://doc.rust-lang.org/reference/expressions/if-expr.html) | ||
2151 | /// [While expression reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops) | ||
1103 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2152 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1104 | pub struct Condition { | 2153 | pub struct Condition { |
1105 | pub(crate) syntax: SyntaxNode, | 2154 | pub(crate) syntax: SyntaxNode, |
@@ -1110,20 +2159,18 @@ impl Condition { | |||
1110 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | 2159 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } |
1111 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 2160 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
1112 | } | 2161 | } |
1113 | 2162 | /// Parameter list **declaration**. | |
1114 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2163 | /// |
1115 | pub struct Block { | 2164 | /// ``` |
1116 | pub(crate) syntax: SyntaxNode, | 2165 | /// fn foo❰ (a: u32, b: bool) ❱ -> u32 {} |
1117 | } | 2166 | /// let bar = ❰ |a, b| ❱ {}; |
1118 | impl ast::AttrsOwner for Block {} | 2167 | /// |
1119 | impl ast::ModuleItemOwner for Block {} | 2168 | /// impl Baz { |
1120 | impl Block { | 2169 | /// fn bruh❰ (&self, a: u32) ❱ {} |
1121 | pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) } | 2170 | /// } |
1122 | pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) } | 2171 | /// ``` |
1123 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 2172 | /// |
1124 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 2173 | /// [Reference](https://doc.rust-lang.org/reference/items/functions.html)ocs to codegen script |
1125 | } | ||
1126 | |||
1127 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2174 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1128 | pub struct ParamList { | 2175 | pub struct ParamList { |
1129 | pub(crate) syntax: SyntaxNode, | 2176 | pub(crate) syntax: SyntaxNode, |
@@ -1134,7 +2181,19 @@ impl ParamList { | |||
1134 | pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) } | 2181 | pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) } |
1135 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 2182 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
1136 | } | 2183 | } |
1137 | 2184 | /// Self parameter **declaration**. | |
2185 | /// | ||
2186 | /// ``` | ||
2187 | /// impl Bruh { | ||
2188 | /// fn foo(❰ self ❱) {} | ||
2189 | /// fn bar(❰ &self ❱) {} | ||
2190 | /// fn baz(❰ &mut self ❱) {} | ||
2191 | /// fn blah<'a>(❰ &'a self ❱) {} | ||
2192 | /// fn blin(❰ self: Box<Self> ❱) {} | ||
2193 | /// } | ||
2194 | /// ``` | ||
2195 | /// | ||
2196 | /// [Reference](https://doc.rust-lang.org/reference/items/functions.html) | ||
1138 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2197 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1139 | pub struct SelfParam { | 2198 | pub struct SelfParam { |
1140 | pub(crate) syntax: SyntaxNode, | 2199 | pub(crate) syntax: SyntaxNode, |
@@ -1149,7 +2208,17 @@ impl SelfParam { | |||
1149 | } | 2208 | } |
1150 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } | 2209 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } |
1151 | } | 2210 | } |
1152 | 2211 | /// Parameter **declaration**. | |
2212 | /// | ||
2213 | /// ``` | ||
2214 | /// fn foo(❰ #[attr] Pat(bar): Pat(u32) ❱, ❰ #[attr] _: bool ❱) {} | ||
2215 | /// | ||
2216 | /// extern "C" { | ||
2217 | /// fn bar(❰ baz: u32 ❱, ❰ ... ❱) -> u32; | ||
2218 | /// } | ||
2219 | /// ``` | ||
2220 | /// | ||
2221 | /// [Reference](https://doc.rust-lang.org/reference/items/functions.html) | ||
1153 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2222 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1154 | pub struct Param { | 2223 | pub struct Param { |
1155 | pub(crate) syntax: SyntaxNode, | 2224 | pub(crate) syntax: SyntaxNode, |
@@ -1160,7 +2229,16 @@ impl Param { | |||
1160 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } | 2229 | pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) } |
1161 | pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) } | 2230 | pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) } |
1162 | } | 2231 | } |
1163 | 2232 | /// Use declaration. | |
2233 | /// | ||
2234 | /// ``` | ||
2235 | /// ❰ #[attr] pub use foo; ❱ | ||
2236 | /// ❰ use bar as baz; ❱ | ||
2237 | /// ❰ use bruh::{self, bruuh}; ❱ | ||
2238 | /// ❰ use { blin::blen, blah::* }; | ||
2239 | /// ``` | ||
2240 | /// | ||
2241 | /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html) | ||
1164 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2242 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1165 | pub struct UseItem { | 2243 | pub struct UseItem { |
1166 | pub(crate) syntax: SyntaxNode, | 2244 | pub(crate) syntax: SyntaxNode, |
@@ -1171,7 +2249,16 @@ impl UseItem { | |||
1171 | pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) } | 2249 | pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) } |
1172 | pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) } | 2250 | pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) } |
1173 | } | 2251 | } |
1174 | 2252 | /// Use tree. | |
2253 | /// | ||
2254 | /// ``` | ||
2255 | /// pub use ❰ foo::❰ * ❱ ❱; | ||
2256 | /// use ❰ bar as baz ❱; | ||
2257 | /// use ❰ bruh::bruuh::{ ❰ self ❱, ❰ blin ❱ } ❱; | ||
2258 | /// use ❰ { ❰ blin::blen ❱ } ❱ | ||
2259 | /// ``` | ||
2260 | /// | ||
2261 | /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html) | ||
1175 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2262 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1176 | pub struct UseTree { | 2263 | pub struct UseTree { |
1177 | pub(crate) syntax: SyntaxNode, | 2264 | pub(crate) syntax: SyntaxNode, |
@@ -1182,7 +2269,16 @@ impl UseTree { | |||
1182 | pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) } | 2269 | pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) } |
1183 | pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) } | 2270 | pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) } |
1184 | } | 2271 | } |
1185 | 2272 | /// Item alias. | |
2273 | /// Note: this is not the type alias. | ||
2274 | /// | ||
2275 | /// ``` | ||
2276 | /// use foo ❰ as bar ❱; | ||
2277 | /// use baz::{bruh ❰ as _ ❱}; | ||
2278 | /// extern crate bruuh ❰ as blin ❱; | ||
2279 | /// ``` | ||
2280 | /// | ||
2281 | /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html) | ||
1186 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2282 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1187 | pub struct Alias { | 2283 | pub struct Alias { |
1188 | pub(crate) syntax: SyntaxNode, | 2284 | pub(crate) syntax: SyntaxNode, |
@@ -1191,7 +2287,14 @@ impl ast::NameOwner for Alias {} | |||
1191 | impl Alias { | 2287 | impl Alias { |
1192 | pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) } | 2288 | pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) } |
1193 | } | 2289 | } |
1194 | 2290 | /// Sublist of use trees. | |
2291 | /// | ||
2292 | /// ``` | ||
2293 | /// use bruh::bruuh::❰ { ❰ self ❱, ❰ blin ❱ } ❱; | ||
2294 | /// use ❰ { blin::blen::❰ {} ❱ } ❱ | ||
2295 | /// ``` | ||
2296 | /// | ||
2297 | /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html) | ||
1195 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2298 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1196 | pub struct UseTreeList { | 2299 | pub struct UseTreeList { |
1197 | pub(crate) syntax: SyntaxNode, | 2300 | pub(crate) syntax: SyntaxNode, |
@@ -1201,7 +2304,14 @@ impl UseTreeList { | |||
1201 | pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) } | 2304 | pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) } |
1202 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 2305 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
1203 | } | 2306 | } |
1204 | 2307 | /// Extern crate item. | |
2308 | /// | ||
2309 | /// ``` | ||
2310 | /// ❰ #[attr] pub extern crate foo; ❱ | ||
2311 | /// ❰ extern crate self as bar; ❱ | ||
2312 | /// ``` | ||
2313 | /// | ||
2314 | /// [Reference](https://doc.rust-lang.org/reference/items/extern-crates.html) | ||
1205 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2315 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1206 | pub struct ExternCrateItem { | 2316 | pub struct ExternCrateItem { |
1207 | pub(crate) syntax: SyntaxNode, | 2317 | pub(crate) syntax: SyntaxNode, |
@@ -1214,7 +2324,13 @@ impl ExternCrateItem { | |||
1214 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 2324 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
1215 | pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) } | 2325 | pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) } |
1216 | } | 2326 | } |
1217 | 2327 | /// Call site arguments list. | |
2328 | /// | ||
2329 | /// ``` | ||
2330 | /// foo::<T, U>❰ (42, true) ❱; | ||
2331 | /// ``` | ||
2332 | /// | ||
2333 | /// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html) | ||
1218 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2334 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1219 | pub struct ArgList { | 2335 | pub struct ArgList { |
1220 | pub(crate) syntax: SyntaxNode, | 2336 | pub(crate) syntax: SyntaxNode, |
@@ -1224,16 +2340,41 @@ impl ArgList { | |||
1224 | pub fn args(&self) -> AstChildren<Expr> { support::children(&self.syntax) } | 2340 | pub fn args(&self) -> AstChildren<Expr> { support::children(&self.syntax) } |
1225 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 2341 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
1226 | } | 2342 | } |
1227 | 2343 | /// Path to a symbol. Includes single identifier names and elaborate paths with | |
2344 | /// generic parameters. | ||
2345 | /// | ||
2346 | /// ``` | ||
2347 | /// (0..10).❰ ❰ collect ❱ ::<Vec<_>> ❱(); | ||
2348 | /// ❰ ❰ ❰ Vec ❱ ::<u8> ❱ ::with_capacity ❱(1024); | ||
2349 | /// ❰ ❰ <❰ Foo ❱ as ❰ ❰ bar ❱ ::Bar ❱> ❱ ::baz ❱(); | ||
2350 | /// ❰ ❰ <❰ bruh ❱> ❱ ::bruuh ❱(); | ||
2351 | /// ``` | ||
2352 | /// | ||
2353 | /// [Reference](https://doc.rust-lang.org/reference/paths.html) | ||
1228 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2354 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1229 | pub struct Path { | 2355 | pub struct Path { |
1230 | pub(crate) syntax: SyntaxNode, | 2356 | pub(crate) syntax: SyntaxNode, |
1231 | } | 2357 | } |
1232 | impl Path { | 2358 | impl Path { |
1233 | pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) } | 2359 | pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) } |
2360 | pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) } | ||
1234 | pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) } | 2361 | pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) } |
1235 | } | 2362 | } |
1236 | 2363 | /// Segment of the path to a symbol. | |
2364 | /// Only path segment of an absolute path holds the `::` token, | ||
2365 | /// all other `::` tokens that connect path segments reside under `Path` itself.` | ||
2366 | /// | ||
2367 | /// ``` | ||
2368 | /// (0..10).❰ collect ❱ :: ❰ <Vec<_>> ❱(); | ||
2369 | /// ❰ Vec ❱ :: ❰ <u8> ❱ :: ❰ with_capacity ❱(1024); | ||
2370 | /// ❰ <❰ Foo ❱ as ❰ bar ❱ :: ❰ Bar ❱> ❱ :: ❰ baz ❱(); | ||
2371 | /// ❰ <❰ bruh ❱> ❱ :: ❰ bruuh ❱(); | ||
2372 | /// | ||
2373 | /// // Note that only in this case `::` token is inlcuded: | ||
2374 | /// ❰ ::foo ❱; | ||
2375 | /// ``` | ||
2376 | /// | ||
2377 | /// [Reference](https://doc.rust-lang.org/reference/paths.html) | ||
1237 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2378 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1238 | pub struct PathSegment { | 2379 | pub struct PathSegment { |
1239 | pub(crate) syntax: SyntaxNode, | 2380 | pub(crate) syntax: SyntaxNode, |
@@ -1251,7 +2392,15 @@ impl PathSegment { | |||
1251 | pub fn path_type(&self) -> Option<PathType> { support::child(&self.syntax) } | 2392 | pub fn path_type(&self) -> Option<PathType> { support::child(&self.syntax) } |
1252 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } | 2393 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } |
1253 | } | 2394 | } |
1254 | 2395 | /// List of type arguments that are passed at generic instantiation site. | |
2396 | /// | ||
2397 | /// ``` | ||
2398 | /// type _ = Foo ❰ ::<'a, u64, Item = Bar, 42, {true}> ❱::Bar; | ||
2399 | /// | ||
2400 | /// Vec❰ ::<bool> ❱::(); | ||
2401 | /// ``` | ||
2402 | /// | ||
2403 | /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions) | ||
1255 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2404 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1256 | pub struct TypeArgList { | 2405 | pub struct TypeArgList { |
1257 | pub(crate) syntax: SyntaxNode, | 2406 | pub(crate) syntax: SyntaxNode, |
@@ -1266,7 +2415,13 @@ impl TypeArgList { | |||
1266 | pub fn const_args(&self) -> AstChildren<ConstArg> { support::children(&self.syntax) } | 2415 | pub fn const_args(&self) -> AstChildren<ConstArg> { support::children(&self.syntax) } |
1267 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } | 2416 | pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) } |
1268 | } | 2417 | } |
1269 | 2418 | /// Type argument that is passed at generic instantiation site. | |
2419 | /// | ||
2420 | /// ``` | ||
2421 | /// type _ = Foo::<'a, ❰ u64 ❱, ❰ bool ❱, Item = Bar, 42>::Baz; | ||
2422 | /// ``` | ||
2423 | /// | ||
2424 | /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions) | ||
1270 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2425 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1271 | pub struct TypeArg { | 2426 | pub struct TypeArg { |
1272 | pub(crate) syntax: SyntaxNode, | 2427 | pub(crate) syntax: SyntaxNode, |
@@ -1274,7 +2429,13 @@ pub struct TypeArg { | |||
1274 | impl TypeArg { | 2429 | impl TypeArg { |
1275 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 2430 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
1276 | } | 2431 | } |
1277 | 2432 | /// Associated type argument that is passed at generic instantiation site. | |
2433 | /// ``` | ||
2434 | /// type Foo = Bar::<'a, u64, bool, ❰ Item = Baz ❱, 42>::Bruh; | ||
2435 | /// | ||
2436 | /// trait Bruh<T>: Iterator<❰ Item: Debug ❱> {} | ||
2437 | /// ``` | ||
2438 | /// | ||
1278 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2439 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1279 | pub struct AssocTypeArg { | 2440 | pub struct AssocTypeArg { |
1280 | pub(crate) syntax: SyntaxNode, | 2441 | pub(crate) syntax: SyntaxNode, |
@@ -1285,7 +2446,15 @@ impl AssocTypeArg { | |||
1285 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | 2446 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } |
1286 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } | 2447 | pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) } |
1287 | } | 2448 | } |
1288 | 2449 | /// Lifetime argument that is passed at generic instantiation site. | |
2450 | /// | ||
2451 | /// ``` | ||
2452 | /// fn foo<'a>(s: &'a str) { | ||
2453 | /// bar::<❰ 'a ❱>(s); | ||
2454 | /// } | ||
2455 | /// ``` | ||
2456 | /// | ||
2457 | /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions) | ||
1289 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2458 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1290 | pub struct LifetimeArg { | 2459 | pub struct LifetimeArg { |
1291 | pub(crate) syntax: SyntaxNode, | 2460 | pub(crate) syntax: SyntaxNode, |
@@ -1295,24 +2464,41 @@ impl LifetimeArg { | |||
1295 | support::token(&self.syntax, T![lifetime]) | 2464 | support::token(&self.syntax, T![lifetime]) |
1296 | } | 2465 | } |
1297 | } | 2466 | } |
1298 | 2467 | /// Constant value argument that is passed at generic instantiation site. | |
2468 | /// | ||
2469 | /// ``` | ||
2470 | /// foo::<u32, ❰ { true } ❱>(); | ||
2471 | /// | ||
2472 | /// bar::<❰ { 2 + 2} ❱>(); | ||
2473 | /// ``` | ||
2474 | /// | ||
2475 | /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter) | ||
1299 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2476 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1300 | pub struct ConstArg { | 2477 | pub struct ConstArg { |
1301 | pub(crate) syntax: SyntaxNode, | 2478 | pub(crate) syntax: SyntaxNode, |
1302 | } | 2479 | } |
1303 | impl ConstArg { | 2480 | impl ConstArg { |
1304 | pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) } | 2481 | pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) } |
1305 | pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } | ||
1306 | pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) } | 2482 | pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) } |
1307 | } | 2483 | } |
1308 | 2484 | /// FIXME: (@edwin0cheng) Remove it to use ItemList instead | |
2485 | /// https://github.com/rust-analyzer/rust-analyzer/pull/4083#discussion_r422666243 | ||
2486 | /// | ||
2487 | /// [Reference](https://doc.rust-lang.org/reference/macros.html) | ||
1309 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2488 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1310 | pub struct MacroItems { | 2489 | pub struct MacroItems { |
1311 | pub(crate) syntax: SyntaxNode, | 2490 | pub(crate) syntax: SyntaxNode, |
1312 | } | 2491 | } |
1313 | impl ast::ModuleItemOwner for MacroItems {} | 2492 | impl ast::ModuleItemOwner for MacroItems {} |
1314 | impl MacroItems {} | 2493 | impl MacroItems {} |
1315 | 2494 | /// FIXME: (@edwin0cheng) add some documentation here. As per the writing | |
2495 | /// of this comment this ast node is not used. | ||
2496 | /// | ||
2497 | /// ``` | ||
2498 | /// // FIXME: example here | ||
2499 | /// ``` | ||
2500 | /// | ||
2501 | /// [Reference](https://doc.rust-lang.org/reference/macros.html) | ||
1316 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2502 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1317 | pub struct MacroStmts { | 2503 | pub struct MacroStmts { |
1318 | pub(crate) syntax: SyntaxNode, | 2504 | pub(crate) syntax: SyntaxNode, |
@@ -1321,7 +2507,18 @@ impl MacroStmts { | |||
1321 | pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) } | 2507 | pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) } |
1322 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 2508 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
1323 | } | 2509 | } |
1324 | 2510 | /// List of items in an extern block. | |
2511 | /// | ||
2512 | /// ``` | ||
2513 | /// extern "C" ❰ | ||
2514 | /// { | ||
2515 | /// fn foo(); | ||
2516 | /// static var: u32; | ||
2517 | /// } | ||
2518 | /// ❱ | ||
2519 | /// ``` | ||
2520 | /// | ||
2521 | /// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html) | ||
1325 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2522 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1326 | pub struct ExternItemList { | 2523 | pub struct ExternItemList { |
1327 | pub(crate) syntax: SyntaxNode, | 2524 | pub(crate) syntax: SyntaxNode, |
@@ -1332,7 +2529,18 @@ impl ExternItemList { | |||
1332 | pub fn extern_items(&self) -> AstChildren<ExternItem> { support::children(&self.syntax) } | 2529 | pub fn extern_items(&self) -> AstChildren<ExternItem> { support::children(&self.syntax) } |
1333 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } | 2530 | pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) } |
1334 | } | 2531 | } |
1335 | 2532 | /// Extern block. | |
2533 | /// | ||
2534 | /// ``` | ||
2535 | /// ❰ | ||
2536 | /// extern "C" { | ||
2537 | /// fn foo(); | ||
2538 | /// } | ||
2539 | /// ❱ | ||
2540 | /// | ||
2541 | /// ``` | ||
2542 | /// | ||
2543 | /// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html) | ||
1336 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2544 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1337 | pub struct ExternBlock { | 2545 | pub struct ExternBlock { |
1338 | pub(crate) syntax: SyntaxNode, | 2546 | pub(crate) syntax: SyntaxNode, |
@@ -1341,7 +2549,15 @@ impl ExternBlock { | |||
1341 | pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) } | 2549 | pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) } |
1342 | pub fn extern_item_list(&self) -> Option<ExternItemList> { support::child(&self.syntax) } | 2550 | pub fn extern_item_list(&self) -> Option<ExternItemList> { support::child(&self.syntax) } |
1343 | } | 2551 | } |
1344 | 2552 | /// Meta item in an attribute. | |
2553 | /// | ||
2554 | /// ``` | ||
2555 | /// #[❰ bar::baz = "42" ❱] | ||
2556 | /// #[❰ bruh(bruuh("true")) ❱] | ||
2557 | /// struct Foo; | ||
2558 | /// ``` | ||
2559 | /// | ||
2560 | /// [Reference](https://doc.rust-lang.org/reference/attributes.html?highlight=meta,item#meta-item-attribute-syntax) | ||
1345 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2561 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1346 | pub struct MetaItem { | 2562 | pub struct MetaItem { |
1347 | pub(crate) syntax: SyntaxNode, | 2563 | pub(crate) syntax: SyntaxNode, |
@@ -1352,7 +2568,15 @@ impl MetaItem { | |||
1352 | pub fn attr_input(&self) -> Option<AttrInput> { support::child(&self.syntax) } | 2568 | pub fn attr_input(&self) -> Option<AttrInput> { support::child(&self.syntax) } |
1353 | pub fn nested_meta_items(&self) -> AstChildren<MetaItem> { support::children(&self.syntax) } | 2569 | pub fn nested_meta_items(&self) -> AstChildren<MetaItem> { support::children(&self.syntax) } |
1354 | } | 2570 | } |
1355 | 2571 | /// Macro 2.0 definition. | |
2572 | /// Their syntax is still WIP by rustc team... | ||
2573 | /// ``` | ||
2574 | /// ❰ | ||
2575 | /// macro foo { } | ||
2576 | /// ❱ | ||
2577 | /// ``` | ||
2578 | /// | ||
2579 | /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/1584-macros.md) | ||
1356 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2580 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1357 | pub struct MacroDef { | 2581 | pub struct MacroDef { |
1358 | pub(crate) syntax: SyntaxNode, | 2582 | pub(crate) syntax: SyntaxNode, |
@@ -1361,7 +2585,7 @@ impl MacroDef { | |||
1361 | pub fn name(&self) -> Option<Name> { support::child(&self.syntax) } | 2585 | pub fn name(&self) -> Option<Name> { support::child(&self.syntax) } |
1362 | pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) } | 2586 | pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) } |
1363 | } | 2587 | } |
1364 | 2588 | /// Any kind of nominal type definition. | |
1365 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2589 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1366 | pub enum NominalDef { | 2590 | pub enum NominalDef { |
1367 | StructDef(StructDef), | 2591 | StructDef(StructDef), |
@@ -1371,14 +2595,14 @@ pub enum NominalDef { | |||
1371 | impl ast::NameOwner for NominalDef {} | 2595 | impl ast::NameOwner for NominalDef {} |
1372 | impl ast::TypeParamsOwner for NominalDef {} | 2596 | impl ast::TypeParamsOwner for NominalDef {} |
1373 | impl ast::AttrsOwner for NominalDef {} | 2597 | impl ast::AttrsOwner for NominalDef {} |
1374 | 2598 | /// Any kind of **declared** generic parameter | |
1375 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2599 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1376 | pub enum GenericParam { | 2600 | pub enum GenericParam { |
1377 | LifetimeParam(LifetimeParam), | 2601 | LifetimeParam(LifetimeParam), |
1378 | TypeParam(TypeParam), | 2602 | TypeParam(TypeParam), |
1379 | ConstParam(ConstParam), | 2603 | ConstParam(ConstParam), |
1380 | } | 2604 | } |
1381 | 2605 | /// Any kind of generic argument passed at instantiation site | |
1382 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2606 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1383 | pub enum GenericArg { | 2607 | pub enum GenericArg { |
1384 | LifetimeArg(LifetimeArg), | 2608 | LifetimeArg(LifetimeArg), |
@@ -1386,7 +2610,7 @@ pub enum GenericArg { | |||
1386 | ConstArg(ConstArg), | 2610 | ConstArg(ConstArg), |
1387 | AssocTypeArg(AssocTypeArg), | 2611 | AssocTypeArg(AssocTypeArg), |
1388 | } | 2612 | } |
1389 | 2613 | /// Any kind of construct valid in type context | |
1390 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2614 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1391 | pub enum TypeRef { | 2615 | pub enum TypeRef { |
1392 | ParenType(ParenType), | 2616 | ParenType(ParenType), |
@@ -1403,7 +2627,7 @@ pub enum TypeRef { | |||
1403 | ImplTraitType(ImplTraitType), | 2627 | ImplTraitType(ImplTraitType), |
1404 | DynTraitType(DynTraitType), | 2628 | DynTraitType(DynTraitType), |
1405 | } | 2629 | } |
1406 | 2630 | /// Any kind of top-level item that may appear in a module | |
1407 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2631 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1408 | pub enum ModuleItem { | 2632 | pub enum ModuleItem { |
1409 | StructDef(StructDef), | 2633 | StructDef(StructDef), |
@@ -1424,16 +2648,20 @@ pub enum ModuleItem { | |||
1424 | impl ast::NameOwner for ModuleItem {} | 2648 | impl ast::NameOwner for ModuleItem {} |
1425 | impl ast::AttrsOwner for ModuleItem {} | 2649 | impl ast::AttrsOwner for ModuleItem {} |
1426 | impl ast::VisibilityOwner for ModuleItem {} | 2650 | impl ast::VisibilityOwner for ModuleItem {} |
1427 | 2651 | /// Any kind of item that may appear in an impl block | |
2652 | /// | ||
2653 | /// // FIXME: impl blocks can also contain MacroCall | ||
1428 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2654 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1429 | pub enum ImplItem { | 2655 | pub enum AssocItem { |
1430 | FnDef(FnDef), | 2656 | FnDef(FnDef), |
1431 | TypeAliasDef(TypeAliasDef), | 2657 | TypeAliasDef(TypeAliasDef), |
1432 | ConstDef(ConstDef), | 2658 | ConstDef(ConstDef), |
1433 | } | 2659 | } |
1434 | impl ast::NameOwner for ImplItem {} | 2660 | impl ast::NameOwner for AssocItem {} |
1435 | impl ast::AttrsOwner for ImplItem {} | 2661 | impl ast::AttrsOwner for AssocItem {} |
1436 | 2662 | /// Any kind of item that may appear in an extern block | |
2663 | /// | ||
2664 | /// // FIXME: extern blocks can also contain MacroCall | ||
1437 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2665 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1438 | pub enum ExternItem { | 2666 | pub enum ExternItem { |
1439 | FnDef(FnDef), | 2667 | FnDef(FnDef), |
@@ -1442,7 +2670,7 @@ pub enum ExternItem { | |||
1442 | impl ast::NameOwner for ExternItem {} | 2670 | impl ast::NameOwner for ExternItem {} |
1443 | impl ast::AttrsOwner for ExternItem {} | 2671 | impl ast::AttrsOwner for ExternItem {} |
1444 | impl ast::VisibilityOwner for ExternItem {} | 2672 | impl ast::VisibilityOwner for ExternItem {} |
1445 | 2673 | /// Any kind of expression | |
1446 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2674 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1447 | pub enum Expr { | 2675 | pub enum Expr { |
1448 | TupleExpr(TupleExpr), | 2676 | TupleExpr(TupleExpr), |
@@ -1467,6 +2695,7 @@ pub enum Expr { | |||
1467 | FieldExpr(FieldExpr), | 2695 | FieldExpr(FieldExpr), |
1468 | AwaitExpr(AwaitExpr), | 2696 | AwaitExpr(AwaitExpr), |
1469 | TryExpr(TryExpr), | 2697 | TryExpr(TryExpr), |
2698 | EffectExpr(EffectExpr), | ||
1470 | CastExpr(CastExpr), | 2699 | CastExpr(CastExpr), |
1471 | RefExpr(RefExpr), | 2700 | RefExpr(RefExpr), |
1472 | PrefixExpr(PrefixExpr), | 2701 | PrefixExpr(PrefixExpr), |
@@ -1477,7 +2706,7 @@ pub enum Expr { | |||
1477 | BoxExpr(BoxExpr), | 2706 | BoxExpr(BoxExpr), |
1478 | } | 2707 | } |
1479 | impl ast::AttrsOwner for Expr {} | 2708 | impl ast::AttrsOwner for Expr {} |
1480 | 2709 | /// Any kind of pattern | |
1481 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2710 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1482 | pub enum Pat { | 2711 | pub enum Pat { |
1483 | OrPat(OrPat), | 2712 | OrPat(OrPat), |
@@ -1496,25 +2725,28 @@ pub enum Pat { | |||
1496 | LiteralPat(LiteralPat), | 2725 | LiteralPat(LiteralPat), |
1497 | MacroPat(MacroPat), | 2726 | MacroPat(MacroPat), |
1498 | } | 2727 | } |
1499 | 2728 | /// Any kind of pattern that appears directly inside of the curly | |
2729 | /// braces of a record pattern | ||
1500 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2730 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1501 | pub enum RecordInnerPat { | 2731 | pub enum RecordInnerPat { |
1502 | RecordFieldPat(RecordFieldPat), | 2732 | RecordFieldPat(RecordFieldPat), |
1503 | BindPat(BindPat), | 2733 | BindPat(BindPat), |
1504 | } | 2734 | } |
1505 | 2735 | /// Any kind of input to an attribute | |
1506 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2736 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1507 | pub enum AttrInput { | 2737 | pub enum AttrInput { |
1508 | Literal(Literal), | 2738 | Literal(Literal), |
1509 | TokenTree(TokenTree), | 2739 | TokenTree(TokenTree), |
1510 | } | 2740 | } |
1511 | 2741 | /// Any kind of statement | |
2742 | /// Note: there are no empty statements, these are just represented as | ||
2743 | /// bare semicolons without a dedicated statement ast node. | ||
1512 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2744 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1513 | pub enum Stmt { | 2745 | pub enum Stmt { |
1514 | LetStmt(LetStmt), | 2746 | LetStmt(LetStmt), |
1515 | ExprStmt(ExprStmt), | 2747 | ExprStmt(ExprStmt), |
1516 | } | 2748 | } |
1517 | 2749 | /// Any kind of fields list (record or tuple field lists) | |
1518 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 2750 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1519 | pub enum FieldDefList { | 2751 | pub enum FieldDefList { |
1520 | RecordFieldDefList(RecordFieldDefList), | 2752 | RecordFieldDefList(RecordFieldDefList), |
@@ -1949,6 +3181,17 @@ impl AstNode for LoopExpr { | |||
1949 | } | 3181 | } |
1950 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | 3182 | fn syntax(&self) -> &SyntaxNode { &self.syntax } |
1951 | } | 3183 | } |
3184 | impl AstNode for EffectExpr { | ||
3185 | fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR } | ||
3186 | fn cast(syntax: SyntaxNode) -> Option<Self> { | ||
3187 | if Self::can_cast(syntax.kind()) { | ||
3188 | Some(Self { syntax }) | ||
3189 | } else { | ||
3190 | None | ||
3191 | } | ||
3192 | } | ||
3193 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | ||
3194 | } | ||
1952 | impl AstNode for ForExpr { | 3195 | impl AstNode for ForExpr { |
1953 | fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_EXPR } | 3196 | fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_EXPR } |
1954 | fn cast(syntax: SyntaxNode) -> Option<Self> { | 3197 | fn cast(syntax: SyntaxNode) -> Option<Self> { |
@@ -2631,17 +3874,6 @@ impl AstNode for Condition { | |||
2631 | } | 3874 | } |
2632 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | 3875 | fn syntax(&self) -> &SyntaxNode { &self.syntax } |
2633 | } | 3876 | } |
2634 | impl AstNode for Block { | ||
2635 | fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK } | ||
2636 | fn cast(syntax: SyntaxNode) -> Option<Self> { | ||
2637 | if Self::can_cast(syntax.kind()) { | ||
2638 | Some(Self { syntax }) | ||
2639 | } else { | ||
2640 | None | ||
2641 | } | ||
2642 | } | ||
2643 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | ||
2644 | } | ||
2645 | impl AstNode for ParamList { | 3877 | impl AstNode for ParamList { |
2646 | fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST } | 3878 | fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST } |
2647 | fn cast(syntax: SyntaxNode) -> Option<Self> { | 3879 | fn cast(syntax: SyntaxNode) -> Option<Self> { |
@@ -3163,16 +4395,16 @@ impl AstNode for ModuleItem { | |||
3163 | } | 4395 | } |
3164 | } | 4396 | } |
3165 | } | 4397 | } |
3166 | impl From<FnDef> for ImplItem { | 4398 | impl From<FnDef> for AssocItem { |
3167 | fn from(node: FnDef) -> ImplItem { ImplItem::FnDef(node) } | 4399 | fn from(node: FnDef) -> AssocItem { AssocItem::FnDef(node) } |
3168 | } | 4400 | } |
3169 | impl From<TypeAliasDef> for ImplItem { | 4401 | impl From<TypeAliasDef> for AssocItem { |
3170 | fn from(node: TypeAliasDef) -> ImplItem { ImplItem::TypeAliasDef(node) } | 4402 | fn from(node: TypeAliasDef) -> AssocItem { AssocItem::TypeAliasDef(node) } |
3171 | } | 4403 | } |
3172 | impl From<ConstDef> for ImplItem { | 4404 | impl From<ConstDef> for AssocItem { |
3173 | fn from(node: ConstDef) -> ImplItem { ImplItem::ConstDef(node) } | 4405 | fn from(node: ConstDef) -> AssocItem { AssocItem::ConstDef(node) } |
3174 | } | 4406 | } |
3175 | impl AstNode for ImplItem { | 4407 | impl AstNode for AssocItem { |
3176 | fn can_cast(kind: SyntaxKind) -> bool { | 4408 | fn can_cast(kind: SyntaxKind) -> bool { |
3177 | match kind { | 4409 | match kind { |
3178 | FN_DEF | TYPE_ALIAS_DEF | CONST_DEF => true, | 4410 | FN_DEF | TYPE_ALIAS_DEF | CONST_DEF => true, |
@@ -3181,18 +4413,18 @@ impl AstNode for ImplItem { | |||
3181 | } | 4413 | } |
3182 | fn cast(syntax: SyntaxNode) -> Option<Self> { | 4414 | fn cast(syntax: SyntaxNode) -> Option<Self> { |
3183 | let res = match syntax.kind() { | 4415 | let res = match syntax.kind() { |
3184 | FN_DEF => ImplItem::FnDef(FnDef { syntax }), | 4416 | FN_DEF => AssocItem::FnDef(FnDef { syntax }), |
3185 | TYPE_ALIAS_DEF => ImplItem::TypeAliasDef(TypeAliasDef { syntax }), | 4417 | TYPE_ALIAS_DEF => AssocItem::TypeAliasDef(TypeAliasDef { syntax }), |
3186 | CONST_DEF => ImplItem::ConstDef(ConstDef { syntax }), | 4418 | CONST_DEF => AssocItem::ConstDef(ConstDef { syntax }), |
3187 | _ => return None, | 4419 | _ => return None, |
3188 | }; | 4420 | }; |
3189 | Some(res) | 4421 | Some(res) |
3190 | } | 4422 | } |
3191 | fn syntax(&self) -> &SyntaxNode { | 4423 | fn syntax(&self) -> &SyntaxNode { |
3192 | match self { | 4424 | match self { |
3193 | ImplItem::FnDef(it) => &it.syntax, | 4425 | AssocItem::FnDef(it) => &it.syntax, |
3194 | ImplItem::TypeAliasDef(it) => &it.syntax, | 4426 | AssocItem::TypeAliasDef(it) => &it.syntax, |
3195 | ImplItem::ConstDef(it) => &it.syntax, | 4427 | AssocItem::ConstDef(it) => &it.syntax, |
3196 | } | 4428 | } |
3197 | } | 4429 | } |
3198 | } | 4430 | } |
@@ -3290,6 +4522,9 @@ impl From<AwaitExpr> for Expr { | |||
3290 | impl From<TryExpr> for Expr { | 4522 | impl From<TryExpr> for Expr { |
3291 | fn from(node: TryExpr) -> Expr { Expr::TryExpr(node) } | 4523 | fn from(node: TryExpr) -> Expr { Expr::TryExpr(node) } |
3292 | } | 4524 | } |
4525 | impl From<EffectExpr> for Expr { | ||
4526 | fn from(node: EffectExpr) -> Expr { Expr::EffectExpr(node) } | ||
4527 | } | ||
3293 | impl From<CastExpr> for Expr { | 4528 | impl From<CastExpr> for Expr { |
3294 | fn from(node: CastExpr) -> Expr { Expr::CastExpr(node) } | 4529 | fn from(node: CastExpr) -> Expr { Expr::CastExpr(node) } |
3295 | } | 4530 | } |
@@ -3320,8 +4555,10 @@ impl AstNode for Expr { | |||
3320 | TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR | 4555 | TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR |
3321 | | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL | 4556 | | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL |
3322 | | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR | 4557 | | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR |
3323 | | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | CAST_EXPR | REF_EXPR | 4558 | | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR |
3324 | | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => true, | 4559 | | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => { |
4560 | true | ||
4561 | } | ||
3325 | _ => false, | 4562 | _ => false, |
3326 | } | 4563 | } |
3327 | } | 4564 | } |
@@ -3349,6 +4586,7 @@ impl AstNode for Expr { | |||
3349 | FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }), | 4586 | FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }), |
3350 | AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }), | 4587 | AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }), |
3351 | TRY_EXPR => Expr::TryExpr(TryExpr { syntax }), | 4588 | TRY_EXPR => Expr::TryExpr(TryExpr { syntax }), |
4589 | EFFECT_EXPR => Expr::EffectExpr(EffectExpr { syntax }), | ||
3352 | CAST_EXPR => Expr::CastExpr(CastExpr { syntax }), | 4590 | CAST_EXPR => Expr::CastExpr(CastExpr { syntax }), |
3353 | REF_EXPR => Expr::RefExpr(RefExpr { syntax }), | 4591 | REF_EXPR => Expr::RefExpr(RefExpr { syntax }), |
3354 | PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }), | 4592 | PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }), |
@@ -3385,6 +4623,7 @@ impl AstNode for Expr { | |||
3385 | Expr::FieldExpr(it) => &it.syntax, | 4623 | Expr::FieldExpr(it) => &it.syntax, |
3386 | Expr::AwaitExpr(it) => &it.syntax, | 4624 | Expr::AwaitExpr(it) => &it.syntax, |
3387 | Expr::TryExpr(it) => &it.syntax, | 4625 | Expr::TryExpr(it) => &it.syntax, |
4626 | Expr::EffectExpr(it) => &it.syntax, | ||
3388 | Expr::CastExpr(it) => &it.syntax, | 4627 | Expr::CastExpr(it) => &it.syntax, |
3389 | Expr::RefExpr(it) => &it.syntax, | 4628 | Expr::RefExpr(it) => &it.syntax, |
3390 | Expr::PrefixExpr(it) => &it.syntax, | 4629 | Expr::PrefixExpr(it) => &it.syntax, |
@@ -3630,7 +4869,7 @@ impl std::fmt::Display for ModuleItem { | |||
3630 | std::fmt::Display::fmt(self.syntax(), f) | 4869 | std::fmt::Display::fmt(self.syntax(), f) |
3631 | } | 4870 | } |
3632 | } | 4871 | } |
3633 | impl std::fmt::Display for ImplItem { | 4872 | impl std::fmt::Display for AssocItem { |
3634 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | 4873 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { |
3635 | std::fmt::Display::fmt(self.syntax(), f) | 4874 | std::fmt::Display::fmt(self.syntax(), f) |
3636 | } | 4875 | } |
@@ -3865,6 +5104,11 @@ impl std::fmt::Display for LoopExpr { | |||
3865 | std::fmt::Display::fmt(self.syntax(), f) | 5104 | std::fmt::Display::fmt(self.syntax(), f) |
3866 | } | 5105 | } |
3867 | } | 5106 | } |
5107 | impl std::fmt::Display for EffectExpr { | ||
5108 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
5109 | std::fmt::Display::fmt(self.syntax(), f) | ||
5110 | } | ||
5111 | } | ||
3868 | impl std::fmt::Display for ForExpr { | 5112 | impl std::fmt::Display for ForExpr { |
3869 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | 5113 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { |
3870 | std::fmt::Display::fmt(self.syntax(), f) | 5114 | std::fmt::Display::fmt(self.syntax(), f) |
@@ -4175,11 +5419,6 @@ impl std::fmt::Display for Condition { | |||
4175 | std::fmt::Display::fmt(self.syntax(), f) | 5419 | std::fmt::Display::fmt(self.syntax(), f) |
4176 | } | 5420 | } |
4177 | } | 5421 | } |
4178 | impl std::fmt::Display for Block { | ||
4179 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
4180 | std::fmt::Display::fmt(self.syntax(), f) | ||
4181 | } | ||
4182 | } | ||
4183 | impl std::fmt::Display for ParamList { | 5422 | impl std::fmt::Display for ParamList { |
4184 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | 5423 | fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { |
4185 | std::fmt::Display::fmt(self.syntax(), f) | 5424 | std::fmt::Display::fmt(self.syntax(), f) |
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs index 492088353..da0eb0926 100644 --- a/crates/ra_syntax/src/ast/make.rs +++ b/crates/ra_syntax/src/ast/make.rs | |||
@@ -1,5 +1,9 @@ | |||
1 | //! This module contains free-standing functions for creating AST fragments out | 1 | //! This module contains free-standing functions for creating AST fragments out |
2 | //! of smaller pieces. | 2 | //! of smaller pieces. |
3 | //! | ||
4 | //! Note that all functions here intended to be stupid constructors, which just | ||
5 | //! assemble a finish node from immediate children. If you want to do something | ||
6 | //! smarter than that, it probably doesn't belong in this module. | ||
3 | use itertools::Itertools; | 7 | use itertools::Itertools; |
4 | use stdx::format_to; | 8 | use stdx::format_to; |
5 | 9 | ||
@@ -13,6 +17,10 @@ pub fn name_ref(text: &str) -> ast::NameRef { | |||
13 | ast_from_text(&format!("fn f() {{ {}; }}", text)) | 17 | ast_from_text(&format!("fn f() {{ {}; }}", text)) |
14 | } | 18 | } |
15 | 19 | ||
20 | pub fn type_ref(text: &str) -> ast::TypeRef { | ||
21 | ast_from_text(&format!("impl {} for D {{}};", text)) | ||
22 | } | ||
23 | |||
16 | pub fn path_segment(name_ref: ast::NameRef) -> ast::PathSegment { | 24 | pub fn path_segment(name_ref: ast::NameRef) -> ast::PathSegment { |
17 | ast_from_text(&format!("use {};", name_ref)) | 25 | ast_from_text(&format!("use {};", name_ref)) |
18 | } | 26 | } |
@@ -82,14 +90,6 @@ pub fn block_expr( | |||
82 | ast_from_text(&format!("fn f() {}", buf)) | 90 | ast_from_text(&format!("fn f() {}", buf)) |
83 | } | 91 | } |
84 | 92 | ||
85 | pub fn block_from_expr(e: ast::Expr) -> ast::Block { | ||
86 | return from_text(&format!("{{ {} }}", e)); | ||
87 | |||
88 | fn from_text(text: &str) -> ast::Block { | ||
89 | ast_from_text(&format!("fn f() {}", text)) | ||
90 | } | ||
91 | } | ||
92 | |||
93 | pub fn expr_unit() -> ast::Expr { | 93 | pub fn expr_unit() -> ast::Expr { |
94 | expr_from_text("()") | 94 | expr_from_text("()") |
95 | } | 95 | } |
@@ -99,6 +99,9 @@ pub fn expr_empty_block() -> ast::Expr { | |||
99 | pub fn expr_unimplemented() -> ast::Expr { | 99 | pub fn expr_unimplemented() -> ast::Expr { |
100 | expr_from_text("unimplemented!()") | 100 | expr_from_text("unimplemented!()") |
101 | } | 101 | } |
102 | pub fn expr_unreachable() -> ast::Expr { | ||
103 | expr_from_text("unreachable!()") | ||
104 | } | ||
102 | pub fn expr_todo() -> ast::Expr { | 105 | pub fn expr_todo() -> ast::Expr { |
103 | expr_from_text("todo!()") | 106 | expr_from_text("todo!()") |
104 | } | 107 | } |
@@ -268,10 +271,6 @@ pub fn token(kind: SyntaxKind) -> SyntaxToken { | |||
268 | .unwrap_or_else(|| panic!("unhandled token: {:?}", kind)) | 271 | .unwrap_or_else(|| panic!("unhandled token: {:?}", kind)) |
269 | } | 272 | } |
270 | 273 | ||
271 | pub fn unreachable_macro_call() -> ast::MacroCall { | ||
272 | ast_from_text(&format!("unreachable!()")) | ||
273 | } | ||
274 | |||
275 | pub fn param(name: String, ty: String) -> ast::Param { | 274 | pub fn param(name: String, ty: String) -> ast::Param { |
276 | ast_from_text(&format!("fn f({}: {}) {{ }}", name, ty)) | 275 | ast_from_text(&format!("fn f({}: {}) {{ }}", name, ty)) |
277 | } | 276 | } |
@@ -281,7 +280,12 @@ pub fn param_list(pats: impl IntoIterator<Item = ast::Param>) -> ast::ParamList | |||
281 | ast_from_text(&format!("fn f({}) {{ }}", args)) | 280 | ast_from_text(&format!("fn f({}) {{ }}", args)) |
282 | } | 281 | } |
283 | 282 | ||
283 | pub fn visibility_pub_crate() -> ast::Visibility { | ||
284 | ast_from_text("pub(crate) struct S") | ||
285 | } | ||
286 | |||
284 | pub fn fn_def( | 287 | pub fn fn_def( |
288 | visibility: Option<ast::Visibility>, | ||
285 | fn_name: ast::Name, | 289 | fn_name: ast::Name, |
286 | type_params: Option<ast::TypeParamList>, | 290 | type_params: Option<ast::TypeParamList>, |
287 | params: ast::ParamList, | 291 | params: ast::ParamList, |
@@ -289,26 +293,21 @@ pub fn fn_def( | |||
289 | ) -> ast::FnDef { | 293 | ) -> ast::FnDef { |
290 | let type_params = | 294 | let type_params = |
291 | if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() }; | 295 | if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() }; |
292 | ast_from_text(&format!("fn {}{}{} {}", fn_name, type_params, params, body)) | 296 | let visibility = match visibility { |
293 | } | 297 | None => String::new(), |
294 | 298 | Some(it) => format!("{} ", it), | |
295 | pub fn add_leading_newlines(amount_of_newlines: usize, t: impl AstNode) -> ast::SourceFile { | 299 | }; |
296 | let newlines = "\n".repeat(amount_of_newlines); | 300 | ast_from_text(&format!("{}fn {}{}{} {}", visibility, fn_name, type_params, params, body)) |
297 | ast_from_text(&format!("{}{}", newlines, t.syntax())) | ||
298 | } | ||
299 | |||
300 | pub fn add_trailing_newlines(amount_of_newlines: usize, t: impl AstNode) -> ast::SourceFile { | ||
301 | let newlines = "\n".repeat(amount_of_newlines); | ||
302 | ast_from_text(&format!("{}{}", t.syntax(), newlines)) | ||
303 | } | ||
304 | |||
305 | pub fn add_pub_crate_modifier(fn_def: ast::FnDef) -> ast::FnDef { | ||
306 | ast_from_text(&format!("pub(crate) {}", fn_def)) | ||
307 | } | 301 | } |
308 | 302 | ||
309 | fn ast_from_text<N: AstNode>(text: &str) -> N { | 303 | fn ast_from_text<N: AstNode>(text: &str) -> N { |
310 | let parse = SourceFile::parse(text); | 304 | let parse = SourceFile::parse(text); |
311 | let node = parse.tree().syntax().descendants().find_map(N::cast).unwrap(); | 305 | let node = match parse.tree().syntax().descendants().find_map(N::cast) { |
306 | Some(it) => it, | ||
307 | None => { | ||
308 | panic!("Failed to make ast node `{}` from text {}", std::any::type_name::<N>(), text) | ||
309 | } | ||
310 | }; | ||
312 | let node = node.syntax().clone(); | 311 | let node = node.syntax().clone(); |
313 | let node = unroot(node); | 312 | let node = unroot(node); |
314 | let node = N::cast(node).unwrap(); | 313 | let node = N::cast(node).unwrap(); |
diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index 10fbe3176..39f9b12ab 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs | |||
@@ -5,7 +5,7 @@ use std::{ | |||
5 | str::{self, FromStr}, | 5 | str::{self, FromStr}, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use ra_text_edit::AtomTextEdit; | 8 | use ra_text_edit::Indel; |
9 | 9 | ||
10 | use crate::{validation, AstNode, SourceFile, TextRange}; | 10 | use crate::{validation, AstNode, SourceFile, TextRange}; |
11 | 11 | ||
@@ -22,7 +22,7 @@ pub fn check_parser(text: &str) { | |||
22 | #[derive(Debug, Clone)] | 22 | #[derive(Debug, Clone)] |
23 | pub struct CheckReparse { | 23 | pub struct CheckReparse { |
24 | text: String, | 24 | text: String, |
25 | edit: AtomTextEdit, | 25 | edit: Indel, |
26 | edited_text: String, | 26 | edited_text: String, |
27 | } | 27 | } |
28 | 28 | ||
@@ -43,7 +43,7 @@ impl CheckReparse { | |||
43 | TextRange::at(delete_start.try_into().unwrap(), delete_len.try_into().unwrap()); | 43 | TextRange::at(delete_start.try_into().unwrap(), delete_len.try_into().unwrap()); |
44 | let edited_text = | 44 | let edited_text = |
45 | format!("{}{}{}", &text[..delete_start], &insert, &text[delete_start + delete_len..]); | 45 | format!("{}{}{}", &text[..delete_start], &insert, &text[delete_start + delete_len..]); |
46 | let edit = AtomTextEdit { delete, insert }; | 46 | let edit = Indel { delete, insert }; |
47 | Some(CheckReparse { text, edit, edited_text }) | 47 | Some(CheckReparse { text, edit, edited_text }) |
48 | } | 48 | } |
49 | 49 | ||
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index ceeb2bde9..61e686da5 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
@@ -39,7 +39,7 @@ pub mod fuzz; | |||
39 | 39 | ||
40 | use std::{marker::PhantomData, sync::Arc}; | 40 | use std::{marker::PhantomData, sync::Arc}; |
41 | 41 | ||
42 | use ra_text_edit::AtomTextEdit; | 42 | use ra_text_edit::Indel; |
43 | use stdx::format_to; | 43 | use stdx::format_to; |
44 | 44 | ||
45 | use crate::syntax_node::GreenNode; | 45 | use crate::syntax_node::GreenNode; |
@@ -126,13 +126,13 @@ impl Parse<SourceFile> { | |||
126 | buf | 126 | buf |
127 | } | 127 | } |
128 | 128 | ||
129 | pub fn reparse(&self, edit: &AtomTextEdit) -> Parse<SourceFile> { | 129 | pub fn reparse(&self, indel: &Indel) -> Parse<SourceFile> { |
130 | self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit)) | 130 | self.incremental_reparse(indel).unwrap_or_else(|| self.full_reparse(indel)) |
131 | } | 131 | } |
132 | 132 | ||
133 | fn incremental_reparse(&self, edit: &AtomTextEdit) -> Option<Parse<SourceFile>> { | 133 | fn incremental_reparse(&self, indel: &Indel) -> Option<Parse<SourceFile>> { |
134 | // FIXME: validation errors are not handled here | 134 | // FIXME: validation errors are not handled here |
135 | parsing::incremental_reparse(self.tree().syntax(), edit, self.errors.to_vec()).map( | 135 | parsing::incremental_reparse(self.tree().syntax(), indel, self.errors.to_vec()).map( |
136 | |(green_node, errors, _reparsed_range)| Parse { | 136 | |(green_node, errors, _reparsed_range)| Parse { |
137 | green: green_node, | 137 | green: green_node, |
138 | errors: Arc::new(errors), | 138 | errors: Arc::new(errors), |
@@ -141,8 +141,9 @@ impl Parse<SourceFile> { | |||
141 | ) | 141 | ) |
142 | } | 142 | } |
143 | 143 | ||
144 | fn full_reparse(&self, edit: &AtomTextEdit) -> Parse<SourceFile> { | 144 | fn full_reparse(&self, indel: &Indel) -> Parse<SourceFile> { |
145 | let text = edit.apply(self.tree().syntax().text().to_string()); | 145 | let mut text = self.tree().syntax().text().to_string(); |
146 | indel.apply(&mut text); | ||
146 | SourceFile::parse(&text) | 147 | SourceFile::parse(&text) |
147 | } | 148 | } |
148 | } | 149 | } |
@@ -237,8 +238,7 @@ fn api_walkthrough() { | |||
237 | 238 | ||
238 | // Let's get the `1 + 1` expression! | 239 | // Let's get the `1 + 1` expression! |
239 | let body: ast::BlockExpr = func.body().unwrap(); | 240 | let body: ast::BlockExpr = func.body().unwrap(); |
240 | let block = body.block().unwrap(); | 241 | let expr: ast::Expr = body.expr().unwrap(); |
241 | let expr: ast::Expr = block.expr().unwrap(); | ||
242 | 242 | ||
243 | // Enums are used to group related ast nodes together, and can be used for | 243 | // Enums are used to group related ast nodes together, and can be used for |
244 | // matching. However, because there are no public fields, it's possible to | 244 | // matching. However, because there are no public fields, it's possible to |
@@ -274,8 +274,8 @@ fn api_walkthrough() { | |||
274 | assert_eq!(text.to_string(), "1 + 1"); | 274 | assert_eq!(text.to_string(), "1 + 1"); |
275 | 275 | ||
276 | // There's a bunch of traversal methods on `SyntaxNode`: | 276 | // There's a bunch of traversal methods on `SyntaxNode`: |
277 | assert_eq!(expr_syntax.parent().as_ref(), Some(block.syntax())); | 277 | assert_eq!(expr_syntax.parent().as_ref(), Some(body.syntax())); |
278 | assert_eq!(block.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{'])); | 278 | assert_eq!(body.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{'])); |
279 | assert_eq!( | 279 | assert_eq!( |
280 | expr_syntax.next_sibling_or_token().map(|it| it.kind()), | 280 | expr_syntax.next_sibling_or_token().map(|it| it.kind()), |
281 | Some(SyntaxKind::WHITESPACE) | 281 | Some(SyntaxKind::WHITESPACE) |
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/ra_syntax/src/parsing/reparsing.rs index ffff0a7b2..edbc190f8 100644 --- a/crates/ra_syntax/src/parsing/reparsing.rs +++ b/crates/ra_syntax/src/parsing/reparsing.rs | |||
@@ -7,7 +7,7 @@ | |||
7 | //! and try to parse only this block. | 7 | //! and try to parse only this block. |
8 | 8 | ||
9 | use ra_parser::Reparser; | 9 | use ra_parser::Reparser; |
10 | use ra_text_edit::AtomTextEdit; | 10 | use ra_text_edit::Indel; |
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
13 | algo, | 13 | algo, |
@@ -24,7 +24,7 @@ use crate::{ | |||
24 | 24 | ||
25 | pub(crate) fn incremental_reparse( | 25 | pub(crate) fn incremental_reparse( |
26 | node: &SyntaxNode, | 26 | node: &SyntaxNode, |
27 | edit: &AtomTextEdit, | 27 | edit: &Indel, |
28 | errors: Vec<SyntaxError>, | 28 | errors: Vec<SyntaxError>, |
29 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { | 29 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { |
30 | if let Some((green, new_errors, old_range)) = reparse_token(node, &edit) { | 30 | if let Some((green, new_errors, old_range)) = reparse_token(node, &edit) { |
@@ -39,7 +39,7 @@ pub(crate) fn incremental_reparse( | |||
39 | 39 | ||
40 | fn reparse_token<'node>( | 40 | fn reparse_token<'node>( |
41 | root: &'node SyntaxNode, | 41 | root: &'node SyntaxNode, |
42 | edit: &AtomTextEdit, | 42 | edit: &Indel, |
43 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { | 43 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { |
44 | let prev_token = algo::find_covering_element(root, edit.delete).as_token()?.clone(); | 44 | let prev_token = algo::find_covering_element(root, edit.delete).as_token()?.clone(); |
45 | let prev_token_kind = prev_token.kind(); | 45 | let prev_token_kind = prev_token.kind(); |
@@ -88,7 +88,7 @@ fn reparse_token<'node>( | |||
88 | 88 | ||
89 | fn reparse_block<'node>( | 89 | fn reparse_block<'node>( |
90 | root: &'node SyntaxNode, | 90 | root: &'node SyntaxNode, |
91 | edit: &AtomTextEdit, | 91 | edit: &Indel, |
92 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { | 92 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { |
93 | let (node, reparser) = find_reparsable_node(root, edit.delete)?; | 93 | let (node, reparser) = find_reparsable_node(root, edit.delete)?; |
94 | let text = get_text_after_edit(node.clone().into(), edit); | 94 | let text = get_text_after_edit(node.clone().into(), edit); |
@@ -108,15 +108,15 @@ fn reparse_block<'node>( | |||
108 | Some((node.replace_with(green), new_parser_errors, node.text_range())) | 108 | Some((node.replace_with(green), new_parser_errors, node.text_range())) |
109 | } | 109 | } |
110 | 110 | ||
111 | fn get_text_after_edit(element: SyntaxElement, edit: &AtomTextEdit) -> String { | 111 | fn get_text_after_edit(element: SyntaxElement, edit: &Indel) -> String { |
112 | let edit = | 112 | let edit = Indel::replace(edit.delete - element.text_range().start(), edit.insert.clone()); |
113 | AtomTextEdit::replace(edit.delete - element.text_range().start(), edit.insert.clone()); | ||
114 | 113 | ||
115 | let text = match element { | 114 | let mut text = match element { |
116 | NodeOrToken::Token(token) => token.text().to_string(), | 115 | NodeOrToken::Token(token) => token.text().to_string(), |
117 | NodeOrToken::Node(node) => node.text().to_string(), | 116 | NodeOrToken::Node(node) => node.text().to_string(), |
118 | }; | 117 | }; |
119 | edit.apply(text) | 118 | edit.apply(&mut text); |
119 | text | ||
120 | } | 120 | } |
121 | 121 | ||
122 | fn is_contextual_kw(text: &str) -> bool { | 122 | fn is_contextual_kw(text: &str) -> bool { |
@@ -167,7 +167,7 @@ fn merge_errors( | |||
167 | old_errors: Vec<SyntaxError>, | 167 | old_errors: Vec<SyntaxError>, |
168 | new_errors: Vec<SyntaxError>, | 168 | new_errors: Vec<SyntaxError>, |
169 | range_before_reparse: TextRange, | 169 | range_before_reparse: TextRange, |
170 | edit: &AtomTextEdit, | 170 | edit: &Indel, |
171 | ) -> Vec<SyntaxError> { | 171 | ) -> Vec<SyntaxError> { |
172 | let mut res = Vec::new(); | 172 | let mut res = Vec::new(); |
173 | 173 | ||
@@ -198,8 +198,12 @@ mod tests { | |||
198 | 198 | ||
199 | fn do_check(before: &str, replace_with: &str, reparsed_len: u32) { | 199 | fn do_check(before: &str, replace_with: &str, reparsed_len: u32) { |
200 | let (range, before) = extract_range(before); | 200 | let (range, before) = extract_range(before); |
201 | let edit = AtomTextEdit::replace(range, replace_with.to_owned()); | 201 | let edit = Indel::replace(range, replace_with.to_owned()); |
202 | let after = edit.apply(before.clone()); | 202 | let after = { |
203 | let mut after = before.clone(); | ||
204 | edit.apply(&mut after); | ||
205 | after | ||
206 | }; | ||
203 | 207 | ||
204 | let fully_reparsed = SourceFile::parse(&after); | 208 | let fully_reparsed = SourceFile::parse(&after); |
205 | let incrementally_reparsed: Parse<SourceFile> = { | 209 | let incrementally_reparsed: Parse<SourceFile> = { |
diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/ra_syntax/src/syntax_node.rs index f9d379abf..e566af7e8 100644 --- a/crates/ra_syntax/src/syntax_node.rs +++ b/crates/ra_syntax/src/syntax_node.rs | |||
@@ -70,6 +70,6 @@ impl SyntaxTreeBuilder { | |||
70 | } | 70 | } |
71 | 71 | ||
72 | pub fn error(&mut self, error: ra_parser::ParseError, text_pos: TextSize) { | 72 | pub fn error(&mut self, error: ra_parser::ParseError, text_pos: TextSize) { |
73 | self.errors.push(SyntaxError::new_at_offset(error.0, text_pos)) | 73 | self.errors.push(SyntaxError::new_at_offset(*error.0, text_pos)) |
74 | } | 74 | } |
75 | } | 75 | } |
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs index e075cd801..d68cf0a82 100644 --- a/crates/ra_syntax/src/validation.rs +++ b/crates/ra_syntax/src/validation.rs | |||
@@ -54,7 +54,7 @@ fn rustc_unescape_error_to_string(err: unescape::EscapeError) -> &'static str { | |||
54 | "Unicode escape must not be empty" | 54 | "Unicode escape must not be empty" |
55 | } | 55 | } |
56 | EE::UnclosedUnicodeEscape => { | 56 | EE::UnclosedUnicodeEscape => { |
57 | "Missing '}' to terminate the unicode escape" | 57 | "Missing `}` to terminate the unicode escape" |
58 | } | 58 | } |
59 | EE::LeadingUnderscoreUnicodeEscape => { | 59 | EE::LeadingUnderscoreUnicodeEscape => { |
60 | "Unicode escape code must not begin with an underscore" | 60 | "Unicode escape code must not begin with an underscore" |
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs index 8e962ab5b..2c08f7e6e 100644 --- a/crates/ra_syntax/src/validation/block.rs +++ b/crates/ra_syntax/src/validation/block.rs | |||
@@ -6,19 +6,17 @@ use crate::{ | |||
6 | SyntaxKind::*, | 6 | SyntaxKind::*, |
7 | }; | 7 | }; |
8 | 8 | ||
9 | pub(crate) fn validate_block_expr(expr: ast::BlockExpr, errors: &mut Vec<SyntaxError>) { | 9 | pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) { |
10 | if let Some(parent) = expr.syntax().parent() { | 10 | if let Some(parent) = block.syntax().parent() { |
11 | match parent.kind() { | 11 | match parent.kind() { |
12 | FN_DEF | EXPR_STMT | BLOCK => return, | 12 | FN_DEF | EXPR_STMT | BLOCK_EXPR => return, |
13 | _ => {} | 13 | _ => {} |
14 | } | 14 | } |
15 | } | 15 | } |
16 | if let Some(block) = expr.block() { | 16 | errors.extend(block.attrs().map(|attr| { |
17 | errors.extend(block.attrs().map(|attr| { | 17 | SyntaxError::new( |
18 | SyntaxError::new( | 18 | "A block in this position cannot accept inner attributes", |
19 | "A block in this position cannot accept inner attributes", | 19 | attr.syntax().text_range(), |
20 | attr.syntax().text_range(), | 20 | ) |
21 | ) | 21 | })) |
22 | })) | ||
23 | } | ||
24 | } | 22 | } |
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast index 95cc83caa..375ed45e0 100644 --- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast | |||
@@ -28,10 +28,9 @@ [email protected] | |||
28 | [email protected] ")" | 28 | [email protected] ")" |
29 | [email protected] " " | 29 | [email protected] " " |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "{" |
32 | [email protected] "{" | 32 | [email protected] "\n" |
33 | [email protected] "\n" | 33 | [email protected] "}" |
34 | [email protected] "}" | ||
35 | [email protected] "\n\n\n" | 34 | [email protected] "\n\n\n" |
36 | [email protected] | 35 | [email protected] |
37 | [email protected] "#" | 36 | [email protected] "#" |
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast index dc3e12091..b72c92c33 100644 --- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast | |||
@@ -21,9 +21,8 @@ [email protected] | |||
21 | [email protected] "(" | 21 | [email protected] "(" |
22 | [email protected] ")" | 22 | [email protected] ")" |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] "{" | 25 | [email protected] "}" |
26 | [email protected] "}" | ||
27 | [email protected] "\n\n" | 26 | [email protected] "\n\n" |
28 | [email protected] | 27 | [email protected] |
29 | [email protected] "}" | 28 | [email protected] "}" |
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast index 97539fcf2..33953d8d7 100644 --- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast | |||
@@ -9,10 +9,9 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n" |
14 | [email protected] "\n" | 14 | [email protected] "}" |
15 | [email protected] "}" | ||
16 | [email protected] "\n\n" | 15 | [email protected] "\n\n" |
17 | [email protected] | 16 | [email protected] |
18 | [email protected] | 17 | [email protected] |
@@ -34,30 +33,28 @@ [email protected] | |||
34 | [email protected] "true" | 33 | [email protected] "true" |
35 | [email protected] " " | 34 | [email protected] " " |
36 | [email protected] | 35 | [email protected] |
37 | [email protected] | 36 | [email protected] "{" |
38 | [email protected] "{" | 37 | [email protected] "\n " |
39 | [email protected] "\n " | 38 | [email protected] |
40 | [email protected] | 39 | [email protected] "1" |
41 | [email protected] "1" | 40 | [email protected] "\n " |
42 | [email protected] "\n " | 41 | [email protected] "}" |
43 | [email protected] "}" | ||
44 | [email protected] " " | 42 | [email protected] " " |
45 | [email protected] "else" | 43 | [email protected] "else" |
46 | [email protected] " " | 44 | [email protected] " " |
47 | [email protected] | 45 | [email protected] |
48 | [email protected] | 46 | [email protected] "{" |
49 | [email protected] "{" | 47 | [email protected] "\n " |
50 | [email protected] "\n " | 48 | [email protected] |
51 | [email protected] | 49 | [email protected] |
52 | [email protected] | 50 | [email protected] "2" |
53 | [email protected] "2" | 51 | [email protected] " " |
54 | [email protected] " " | 52 | [email protected] "+" |
55 | [email protected] "+" | 53 | [email protected] " " |
56 | [email protected] " " | 54 | [email protected] |
57 | [email protected] | 55 | [email protected] "3" |
58 | [email protected] "3" | 56 | [email protected] "\n " |
59 | [email protected] "\n " | 57 | [email protected] "}" |
60 | [email protected] "}" | ||
61 | [email protected] "\n" | 58 | [email protected] "\n" |
62 | [email protected] "}" | 59 | [email protected] "}" |
63 | [email protected] "\n\n" | 60 | [email protected] "\n\n" |
@@ -71,10 +68,9 @@ [email protected] | |||
71 | [email protected] ")" | 68 | [email protected] ")" |
72 | [email protected] " " | 69 | [email protected] " " |
73 | [email protected] | 70 | [email protected] |
74 | [email protected] | 71 | [email protected] "{" |
75 | [email protected] "{" | 72 | [email protected] "\n" |
76 | [email protected] "\n" | 73 | [email protected] "}" |
77 | [email protected] "}" | ||
78 | [email protected] "\n" | 74 | [email protected] "\n" |
79 | error 17..17: expected BANG | 75 | error 17..17: expected BANG |
80 | error 19..19: expected SEMICOLON | 76 | error 19..19: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast index e10bb8174..3bf57eacc 100644 --- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast +++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast | |||
@@ -9,37 +9,36 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "|" |
18 | [email protected] "|" | 18 | [email protected] "|" |
19 | [email protected] "|" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "->" |
22 | [email protected] "->" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "(" |
25 | [email protected] "(" | 25 | [email protected] ")" |
26 | [email protected] ")" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "unsafe" |
30 | [email protected] "unsafe" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "{" |
33 | [email protected] "{" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "(" |
36 | [email protected] "(" | 36 | [email protected] ")" |
37 | [email protected] ")" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] "}" |
39 | [email protected] "}" | 39 | [email protected] ";" |
40 | [email protected] ";" | 40 | [email protected] "\n" |
41 | [email protected] "\n" | 41 | [email protected] "}" |
42 | [email protected] "}" | ||
43 | [email protected] "\n" | 42 | [email protected] "\n" |
44 | error 24..24: expected `{` | 43 | error 24..24: expected a block |
45 | error 24..24: expected SEMICOLON | 44 | error 24..24: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast index 61c361833..9323b7890 100644 --- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast +++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast | |||
@@ -25,8 +25,7 @@ [email protected] | |||
25 | [email protected] "T" | 25 | [email protected] "T" |
26 | [email protected] " " | 26 | [email protected] " " |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "{" |
29 | [email protected] "{" | 29 | [email protected] "}" |
30 | [email protected] "}" | ||
31 | [email protected] "\n" | 30 | [email protected] "\n" |
32 | error 19..19: expected colon | 31 | error 19..19: expected colon |
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast index 92bb47316..93434f34f 100644 --- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast | |||
@@ -9,36 +9,35 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "foo" |
21 | [email protected] "foo" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "1" |
26 | [email protected] "1" | 26 | [email protected] "," |
27 | [email protected] "," | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "2" |
30 | [email protected] "2" | 30 | [email protected] "\n " |
31 | [email protected] "\n " | 31 | [email protected] ")" |
32 | [email protected] ")" | 32 | [email protected] "\n " |
33 | [email protected] "\n " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "return" |
36 | [email protected] "return" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "92" |
39 | [email protected] "92" | 39 | [email protected] ";" |
40 | [email protected] ";" | 40 | [email protected] "\n" |
41 | [email protected] "\n" | 41 | [email protected] "}" |
42 | [email protected] "}" | ||
43 | [email protected] "\n" | 42 | [email protected] "\n" |
44 | error 38..38: expected SEMICOLON | 43 | error 38..38: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast index 7bc718302..628315c78 100644 --- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast +++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast | |||
@@ -20,28 +20,27 @@ [email protected] | |||
20 | [email protected] ")" | 20 | [email protected] ")" |
21 | [email protected] " " | 21 | [email protected] " " |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "let" |
27 | [email protected] "let" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "bar" |
31 | [email protected] "bar" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] "=" |
33 | [email protected] "=" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "92" |
36 | [email protected] "92" | 36 | [email protected] ";" |
37 | [email protected] ";" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "1" |
41 | [email protected] "1" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] "+" |
43 | [email protected] "+" | 43 | [email protected] "\n" |
44 | [email protected] "\n" | 44 | [email protected] "}" |
45 | [email protected] "}" | ||
46 | [email protected] "\n" | 45 | [email protected] "\n" |
47 | error 44..44: expected expression | 46 | error 44..44: expected expression |
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 63194f974..31cc4e551 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast | |||
@@ -33,89 +33,88 @@ [email protected] | |||
33 | [email protected] "ScopeId" | 33 | [email protected] "ScopeId" |
34 | [email protected] " " | 34 | [email protected] " " |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "{" |
37 | [email protected] "{" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "let" |
40 | [email protected] "let" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "res" |
44 | [email protected] "res" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "=" |
46 | [email protected] "=" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "self" |
53 | [email protected] "self" | 53 | [email protected] "." |
54 | [email protected] "." | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "scopes" |
56 | [email protected] "scopes" | 56 | [email protected] "." |
57 | [email protected] "." | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "len" |
59 | [email protected] "len" | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "(" |
61 | [email protected] "(" | 61 | [email protected] ")" |
62 | [email protected] ")" | 62 | [email protected] ";" |
63 | [email protected] ";" | 63 | [email protected] "\n " |
64 | [email protected] "\n " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "self" |
70 | [email protected] "self" | 70 | [email protected] "." |
71 | [email protected] "." | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "scopes" |
73 | [email protected] "scopes" | 73 | [email protected] "." |
74 | [email protected] "." | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "push" |
76 | [email protected] "push" | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "(" |
78 | [email protected] "(" | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "ScopeData" |
83 | [email protected] "ScopeData" | 83 | [email protected] " " |
84 | [email protected] " " | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] "{" |
86 | [email protected] "{" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "parent" |
90 | [email protected] "parent" | 90 | [email protected] ":" |
91 | [email protected] ":" | 91 | [email protected] " " |
92 | [email protected] " " | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] "None" |
97 | [email protected] "None" | 97 | [email protected] "," |
98 | [email protected] "," | 98 | [email protected] " " |
99 | [email protected] " " | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] |
101 | [email protected] | 101 | [email protected] "entries" |
102 | [email protected] "entries" | 102 | [email protected] ":" |
103 | [email protected] ":" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "vec" |
109 | [email protected] "vec" | 109 | [email protected] "!" |
110 | [email protected] "!" | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] "[" |
112 | [email protected] "[" | 112 | [email protected] "]" |
113 | [email protected] "]" | 113 | [email protected] " " |
114 | [email protected] " " | 114 | [email protected] "}" |
115 | [email protected] "}" | 115 | [email protected] ")" |
116 | [email protected] ")" | 116 | [email protected] "\n " |
117 | [email protected] "\n " | 117 | [email protected] "}" |
118 | [email protected] "}" | ||
119 | [email protected] "\n\n " | 118 | [email protected] "\n\n " |
120 | [email protected] | 119 | [email protected] |
121 | [email protected] "fn" | 120 | [email protected] "fn" |
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast index d20bb60f1..4ff27f5c8 100644 --- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast | |||
@@ -9,91 +9,87 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "foo" |
20 | [email protected] "foo" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "let" |
25 | [email protected] "let" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "bar" |
29 | [email protected] "bar" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "=" |
31 | [email protected] "=" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "1" |
34 | [email protected] "1" | 34 | [email protected] ";" |
35 | [email protected] ";" | 35 | [email protected] "\n " |
36 | [email protected] "\n " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "let" |
38 | [email protected] "let" | 38 | [email protected] "\n " |
39 | [email protected] "\n " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "let" |
41 | [email protected] "let" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "baz" |
45 | [email protected] "baz" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] "=" |
47 | [email protected] "=" | 47 | [email protected] " " |
48 | [email protected] " " | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "92" |
50 | [email protected] "92" | 50 | [email protected] ";" |
51 | [email protected] ";" | 51 | [email protected] "\n " |
52 | [email protected] "\n " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "let" |
54 | [email protected] "let" | 54 | [email protected] "\n " |
55 | [email protected] "\n " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "if" |
58 | [email protected] "if" | 58 | [email protected] " " |
59 | [email protected] " " | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "true" |
62 | [email protected] "true" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "{" |
65 | [email protected] | 65 | [email protected] "}" |
66 | [email protected] "{" | 66 | [email protected] "\n " |
67 | [email protected] "}" | 67 | [email protected] |
68 | [email protected] "\n " | 68 | [email protected] "let" |
69 | [email protected] | 69 | [email protected] "\n " |
70 | [email protected] "let" | 70 | [email protected] |
71 | [email protected] "\n " | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "while" |
73 | [email protected] | 73 | [email protected] " " |
74 | [email protected] "while" | 74 | [email protected] |
75 | [email protected] " " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "true" |
77 | [email protected] | 77 | [email protected] " " |
78 | [email protected] "true" | 78 | [email protected] |
79 | [email protected] " " | 79 | [email protected] "{" |
80 | [email protected] | 80 | [email protected] "}" |
81 | [email protected] | 81 | [email protected] "\n " |
82 | [email protected] "{" | 82 | [email protected] |
83 | [email protected] "}" | 83 | [email protected] "let" |
84 | [email protected] "\n " | 84 | [email protected] "\n " |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] "let" | 86 | [email protected] "loop" |
87 | [email protected] "\n " | 87 | [email protected] " " |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] "loop" | 89 | [email protected] "{" |
90 | [email protected] " " | 90 | [email protected] "}" |
91 | [email protected] | 91 | [email protected] "\n" |
92 | [email protected] | 92 | [email protected] "}" |
93 | [email protected] "{" | ||
94 | [email protected] "}" | ||
95 | [email protected] "\n" | ||
96 | [email protected] "}" | ||
97 | [email protected] "\n" | 93 | [email protected] "\n" |
98 | error 24..24: expected expression | 94 | error 24..24: expected expression |
99 | error 24..24: expected SEMICOLON | 95 | error 24..24: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast index 1185f44f9..5f3a31473 100644 --- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast | |||
@@ -12,9 +12,8 @@ [email protected] | |||
12 | [email protected] ")" | 12 | [email protected] ")" |
13 | [email protected] " " | 13 | [email protected] " " |
14 | [email protected] | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "{" |
16 | [email protected] "{" | 16 | [email protected] "}" |
17 | [email protected] "}" | ||
18 | [email protected] "\n" | 17 | [email protected] "\n" |
19 | error 2..2: expected a name | 18 | error 2..2: expected a name |
20 | error 2..2: expected function arguments | 19 | error 2..2: expected function arguments |
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast index c7bf4caa0..1746bd3c1 100644 --- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast +++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast | |||
@@ -26,10 +26,9 @@ [email protected] | |||
26 | [email protected] ")" | 26 | [email protected] ")" |
27 | [email protected] " " | 27 | [email protected] " " |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "{" |
30 | [email protected] "{" | 30 | [email protected] "\n" |
31 | [email protected] "\n" | 31 | [email protected] "}" |
32 | [email protected] "}" | ||
33 | [email protected] "\n" | 32 | [email protected] "\n" |
34 | error 16..16: expected COLON | 33 | error 16..16: expected COLON |
35 | error 16..16: expected type | 34 | error 16..16: expected type |
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index cc0d75cc8..28146f44e 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | |||
@@ -9,37 +9,36 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "[" |
17 | [email protected] "[" | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "1" |
19 | [email protected] "1" | 19 | [email protected] "," |
20 | [email protected] "," | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "2" |
23 | [email protected] "2" | 23 | [email protected] "," |
24 | [email protected] "," | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "@" |
27 | [email protected] "@" | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "," |
30 | [email protected] "," | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "struct" |
33 | [email protected] "struct" | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "," |
35 | [email protected] "," | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "let" |
38 | [email protected] "let" | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "]" |
40 | [email protected] "]" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] "}" |
42 | [email protected] "}" | ||
43 | [email protected] "\n" | 42 | [email protected] "\n" |
44 | [email protected] | 43 | [email protected] |
45 | [email protected] "fn" | 44 | [email protected] "fn" |
@@ -51,44 +50,43 @@ [email protected] | |||
51 | [email protected] ")" | 50 | [email protected] ")" |
52 | [email protected] " " | 51 | [email protected] " " |
53 | [email protected] | 52 | [email protected] |
54 | [email protected] | 53 | [email protected] "{" |
55 | [email protected] "{" | 54 | [email protected] " " |
56 | [email protected] " " | 55 | [email protected] |
57 | [email protected] | 56 | [email protected] |
58 | [email protected] | 57 | [email protected] |
59 | [email protected] | 58 | [email protected] |
60 | [email protected] | 59 | [email protected] |
61 | [email protected] | 60 | [email protected] |
62 | [email protected] | 61 | [email protected] "foo" |
63 | [email protected] "foo" | 62 | [email protected] |
64 | [email protected] | 63 | [email protected] "(" |
65 | [email protected] "(" | 64 | [email protected] |
66 | [email protected] | 65 | [email protected] "1" |
67 | [email protected] "1" | 66 | [email protected] "," |
68 | [email protected] "," | 67 | [email protected] " " |
69 | [email protected] " " | 68 | [email protected] |
70 | [email protected] | 69 | [email protected] "2" |
71 | [email protected] "2" | 70 | [email protected] "," |
72 | [email protected] "," | 71 | [email protected] " " |
73 | [email protected] " " | 72 | [email protected] |
74 | [email protected] | 73 | [email protected] "@" |
75 | [email protected] "@" | 74 | [email protected] |
76 | [email protected] | 75 | [email protected] |
77 | [email protected] | 76 | [email protected] "," |
78 | [email protected] "," | 77 | [email protected] " " |
79 | [email protected] " " | 78 | [email protected] |
80 | [email protected] | 79 | [email protected] "impl" |
81 | [email protected] "impl" | 80 | [email protected] |
82 | [email protected] | 81 | [email protected] |
83 | [email protected] | 82 | [email protected] "," |
84 | [email protected] "," | 83 | [email protected] " " |
85 | [email protected] " " | 84 | [email protected] |
86 | [email protected] | 85 | [email protected] "let" |
87 | [email protected] "let" | 86 | [email protected] |
88 | [email protected] | 87 | [email protected] ")" |
89 | [email protected] ")" | 88 | [email protected] " " |
90 | [email protected] " " | 89 | [email protected] "}" |
91 | [email protected] "}" | ||
92 | [email protected] "\n" | 90 | [email protected] "\n" |
93 | [email protected] | 91 | [email protected] |
94 | [email protected] "fn" | 92 | [email protected] "fn" |
@@ -100,53 +98,52 @@ [email protected] | |||
100 | [email protected] ")" | 98 | [email protected] ")" |
101 | [email protected] " " | 99 | [email protected] " " |
102 | [email protected] | 100 | [email protected] |
103 | [email protected] | 101 | [email protected] "{" |
104 | [email protected] "{" | 102 | [email protected] " " |
105 | [email protected] " " | 103 | [email protected] |
106 | [email protected] | 104 | [email protected] |
107 | [email protected] | 105 | [email protected] |
108 | [email protected] | 106 | [email protected] |
109 | [email protected] | 107 | [email protected] |
110 | [email protected] | 108 | [email protected] |
111 | [email protected] | 109 | [email protected] "foo" |
112 | [email protected] "foo" | 110 | [email protected] "." |
113 | [email protected] "." | 111 | [email protected] |
114 | [email protected] | 112 | [email protected] "bar" |
115 | [email protected] "bar" | 113 | [email protected] |
116 | [email protected] | 114 | [email protected] "(" |
117 | [email protected] "(" | 115 | [email protected] |
118 | [email protected] | 116 | [email protected] "1" |
119 | [email protected] "1" | 117 | [email protected] "," |
120 | [email protected] "," | 118 | [email protected] " " |
121 | [email protected] " " | 119 | [email protected] |
122 | [email protected] | 120 | [email protected] "2" |
123 | [email protected] "2" | 121 | [email protected] "," |
124 | [email protected] "," | 122 | [email protected] " " |
125 | [email protected] " " | 123 | [email protected] |
126 | [email protected] | 124 | [email protected] "@" |
127 | [email protected] "@" | 125 | [email protected] |
128 | [email protected] | 126 | [email protected] |
129 | [email protected] | 127 | [email protected] "," |
130 | [email protected] "," | 128 | [email protected] " " |
131 | [email protected] " " | 129 | [email protected] |
132 | [email protected] | 130 | [email protected] |
133 | [email protected] | 131 | [email protected] "]" |
134 | [email protected] "]" | 132 | [email protected] |
135 | [email protected] | 133 | [email protected] |
136 | [email protected] | 134 | [email protected] "," |
137 | [email protected] "," | 135 | [email protected] " " |
138 | [email protected] " " | 136 | [email protected] |
139 | [email protected] | 137 | [email protected] "trait" |
140 | [email protected] "trait" | 138 | [email protected] |
141 | [email protected] | 139 | [email protected] "," |
142 | [email protected] "," | 140 | [email protected] " " |
143 | [email protected] " " | 141 | [email protected] |
144 | [email protected] | 142 | [email protected] "let" |
145 | [email protected] "let" | 143 | [email protected] |
146 | [email protected] | 144 | [email protected] ")" |
147 | [email protected] ")" | 145 | [email protected] " " |
148 | [email protected] " " | 146 | [email protected] "}" |
149 | [email protected] "}" | ||
150 | [email protected] "\n" | 147 | [email protected] "\n" |
151 | error 16..16: expected expression | 148 | error 16..16: expected expression |
152 | error 17..17: expected R_BRACK | 149 | error 17..17: expected R_BRACK |
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast index c37594146..9ea9d715e 100644 --- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast +++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast | |||
@@ -9,31 +9,30 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "foo" |
19 | [email protected] "foo" | 19 | [email protected] "!" |
20 | [email protected] "!" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] "bar" |
25 | [email protected] "bar" | 25 | [email protected] "," |
26 | [email protected] "," | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] "\"baz\"" |
28 | [email protected] "\"baz\"" | 28 | [email protected] "," |
29 | [email protected] "," | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "1" |
31 | [email protected] "1" | 31 | [email protected] "," |
32 | [email protected] "," | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] "2.0" |
34 | [email protected] "2.0" | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] "}" |
36 | [email protected] "}" | ||
37 | [email protected] " " | 36 | [email protected] " " |
38 | [email protected] "//~ ERROR incorrect c ..." | 37 | [email protected] "//~ ERROR incorrect c ..." |
39 | [email protected] "\n" | 38 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 4296355f2..7c957fdde 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | |||
@@ -62,9 +62,8 @@ [email protected] | |||
62 | [email protected] ")" | 62 | [email protected] ")" |
63 | [email protected] " " | 63 | [email protected] " " |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "{" |
66 | [email protected] "{" | 66 | [email protected] "}" |
67 | [email protected] "}" | ||
68 | [email protected] "\n\n" | 67 | [email protected] "\n\n" |
69 | [email protected] | 68 | [email protected] |
70 | [email protected] "fn" | 69 | [email protected] "fn" |
@@ -76,219 +75,218 @@ [email protected] | |||
76 | [email protected] ")" | 75 | [email protected] ")" |
77 | [email protected] " " | 76 | [email protected] " " |
78 | [email protected] | 77 | [email protected] |
79 | [email protected] | 78 | [email protected] "{" |
80 | [email protected] "{" | 79 | [email protected] "\n " |
81 | [email protected] "\n " | 80 | [email protected] |
82 | [email protected] | 81 | [email protected] "let" |
83 | [email protected] "let" | 82 | [email protected] " " |
84 | [email protected] " " | 83 | [email protected] |
85 | [email protected] | 84 | [email protected] "_" |
86 | [email protected] "_" | 85 | [email protected] ":" |
87 | [email protected] ":" | 86 | [email protected] " " |
88 | [email protected] " " | 87 | [email protected] |
89 | [email protected] | 88 | [email protected] |
90 | [email protected] | 89 | [email protected] |
91 | [email protected] | 90 | [email protected] |
92 | [email protected] | 91 | [email protected] |
93 | [email protected] | 92 | [email protected] |
94 | [email protected] | 93 | [email protected] |
95 | [email protected] | 94 | [email protected] "Box" |
96 | [email protected] "Box" | 95 | [email protected] |
97 | [email protected] | 96 | [email protected] "<" |
98 | [email protected] "<" | 97 | [email protected] |
99 | [email protected] | 98 | [email protected] |
100 | [email protected] | 99 | [email protected] "(" |
101 | [email protected] "(" | 100 | [email protected] |
102 | [email protected] | 101 | [email protected] |
103 | [email protected] | 102 | [email protected] |
104 | [email protected] | 103 | [email protected] |
105 | [email protected] | 104 | [email protected] "Copy" |
106 | [email protected] "Copy" | 105 | [email protected] ")" |
107 | [email protected] ")" | 106 | [email protected] " " |
108 | [email protected] " " | 107 | [email protected] "+" |
109 | [email protected] "+" | 108 | [email protected] " " |
110 | [email protected] " " | 109 | [email protected] |
111 | [email protected] | 110 | [email protected] "(" |
112 | [email protected] "(" | 111 | [email protected] "?" |
113 | [email protected] "?" | 112 | [email protected] |
114 | [email protected] | 113 | [email protected] |
115 | [email protected] | 114 | [email protected] |
116 | [email protected] | 115 | [email protected] |
117 | [email protected] | 116 | [email protected] "Sized" |
118 | [email protected] "Sized" | 117 | [email protected] ")" |
119 | [email protected] ")" | 118 | [email protected] " " |
120 | [email protected] " " | 119 | [email protected] "+" |
121 | [email protected] "+" | 120 | [email protected] " " |
122 | [email protected] " " | 121 | [email protected] |
123 | [email protected] | 122 | [email protected] "(" |
124 | [email protected] "(" | 123 | [email protected] |
125 | [email protected] | 124 | [email protected] "for" |
126 | [email protected] "for" | 125 | [email protected] |
127 | [email protected] | 126 | [email protected] "<" |
128 | [email protected] "<" | 127 | [email protected] |
129 | [email protected] | 128 | [email protected] "\'a" |
130 | [email protected] "\'a" | 129 | [email protected] ">" |
131 | [email protected] ">" | 130 | [email protected] " " |
132 | [email protected] " " | 131 | [email protected] |
133 | [email protected] | 132 | [email protected] |
134 | [email protected] | 133 | [email protected] |
135 | [email protected] | 134 | [email protected] |
136 | [email protected] | 135 | [email protected] "Trait" |
137 | [email protected] "Trait" | 136 | [email protected] |
138 | [email protected] | 137 | [email protected] "<" |
139 | [email protected] "<" | 138 | [email protected] |
140 | [email protected] | 139 | [email protected] "\'a" |
141 | [email protected] "\'a" | 140 | [email protected] ">" |
142 | [email protected] ">" | 141 | [email protected] ")" |
143 | [email protected] ")" | 142 | [email protected] |
144 | [email protected] | 143 | [email protected] |
145 | [email protected] | 144 | [email protected] ">" |
146 | [email protected] ">" | 145 | [email protected] ";" |
147 | [email protected] ";" | 146 | [email protected] "\n " |
148 | [email protected] "\n " | 147 | [email protected] |
149 | [email protected] | 148 | [email protected] "let" |
150 | [email protected] "let" | 149 | [email protected] " " |
151 | [email protected] " " | 150 | [email protected] |
152 | [email protected] | 151 | [email protected] "_" |
153 | [email protected] "_" | 152 | [email protected] ":" |
154 | [email protected] ":" | 153 | [email protected] " " |
155 | [email protected] " " | 154 | [email protected] |
156 | [email protected] | 155 | [email protected] |
157 | [email protected] | 156 | [email protected] |
158 | [email protected] | 157 | [email protected] |
159 | [email protected] | 158 | [email protected] "Box" |
160 | [email protected] "Box" | 159 | [email protected] |
161 | [email protected] | 160 | [email protected] "<" |
162 | [email protected] "<" | 161 | [email protected] |
163 | [email protected] | 162 | [email protected] |
164 | [email protected] | 163 | [email protected] "(" |
165 | [email protected] "(" | 164 | [email protected] |
166 | [email protected] | 165 | [email protected] "?" |
167 | [email protected] "?" | 166 | [email protected] |
168 | [email protected] | 167 | [email protected] |
169 | [email protected] | 168 | [email protected] |
170 | [email protected] | 169 | [email protected] |
171 | [email protected] | 170 | [email protected] |
172 | [email protected] | 171 | [email protected] "Sized" |
173 | [email protected] "Sized" | 172 | [email protected] |
174 | [email protected] | 173 | [email protected] |
175 | [email protected] | 174 | [email protected] ")" |
176 | [email protected] ")" | 175 | [email protected] " " |
177 | [email protected] " " | 176 | [email protected] |
178 | [email protected] | 177 | [email protected] |
179 | [email protected] | 178 | [email protected] "+" |
180 | [email protected] "+" | 179 | [email protected] " " |
181 | [email protected] " " | 180 | [email protected] |
182 | [email protected] | 181 | [email protected] |
183 | [email protected] | 182 | [email protected] "(" |
184 | [email protected] "(" | 183 | [email protected] |
185 | [email protected] | 184 | [email protected] |
186 | [email protected] | 185 | [email protected] |
187 | [email protected] | 186 | [email protected] |
188 | [email protected] | 187 | [email protected] |
189 | [email protected] | 188 | [email protected] |
190 | [email protected] | 189 | [email protected] "for" |
191 | [email protected] "for" | 190 | [email protected] |
192 | [email protected] | 191 | [email protected] "<" |
193 | [email protected] "<" | 192 | [email protected] |
194 | [email protected] | 193 | [email protected] "\'a" |
195 | [email protected] "\'a" | 194 | [email protected] ">" |
196 | [email protected] ">" | 195 | [email protected] " " |
197 | [email protected] " " | 196 | [email protected] |
198 | [email protected] | 197 | [email protected] |
199 | [email protected] | 198 | [email protected] |
200 | [email protected] | 199 | [email protected] |
201 | [email protected] | 200 | [email protected] "Trait" |
202 | [email protected] "Trait" | 201 | [email protected] "<" |
203 | [email protected] "<" | 202 | [email protected] |
204 | [email protected] | 203 | [email protected] "\'a" |
205 | [email protected] "\'a" | 204 | [email protected] ">" |
206 | [email protected] ">" | 205 | [email protected] |
207 | [email protected] | 206 | [email protected] ")" |
208 | [email protected] ")" | 207 | [email protected] " " |
209 | [email protected] " " | 208 | [email protected] "+" |
210 | [email protected] "+" | 209 | [email protected] " " |
211 | [email protected] " " | 210 | [email protected] |
212 | [email protected] | 211 | [email protected] "(" |
213 | [email protected] "(" | 212 | [email protected] |
214 | [email protected] | 213 | [email protected] |
215 | [email protected] | 214 | [email protected] |
216 | [email protected] | 215 | [email protected] |
217 | [email protected] | 216 | [email protected] "Copy" |
218 | [email protected] "Copy" | 217 | [email protected] ")" |
219 | [email protected] ")" | 218 | [email protected] ">" |
220 | [email protected] ">" | 219 | [email protected] |
221 | [email protected] | 220 | [email protected] ";" |
222 | [email protected] ";" | 221 | [email protected] "\n " |
223 | [email protected] "\n " | 222 | [email protected] |
224 | [email protected] | 223 | [email protected] "let" |
225 | [email protected] "let" | 224 | [email protected] " " |
226 | [email protected] " " | 225 | [email protected] |
227 | [email protected] | 226 | [email protected] "_" |
228 | [email protected] "_" | 227 | [email protected] ":" |
229 | [email protected] ":" | 228 | [email protected] " " |
230 | [email protected] " " | 229 | [email protected] |
231 | [email protected] | 230 | [email protected] |
232 | [email protected] | 231 | [email protected] |
233 | [email protected] | 232 | [email protected] |
234 | [email protected] | 233 | [email protected] |
235 | [email protected] | 234 | [email protected] |
236 | [email protected] | 235 | [email protected] |
237 | [email protected] | 236 | [email protected] "Box" |
238 | [email protected] "Box" | 237 | [email protected] |
239 | [email protected] | 238 | [email protected] "<" |
240 | [email protected] "<" | 239 | [email protected] |
241 | [email protected] | 240 | [email protected] |
242 | [email protected] | 241 | [email protected] "(" |
243 | [email protected] "(" | 242 | [email protected] |
244 | [email protected] | 243 | [email protected] "for" |
245 | [email protected] "for" | 244 | [email protected] |
246 | [email protected] | 245 | [email protected] "<" |
247 | [email protected] "<" | 246 | [email protected] |
248 | [email protected] | 247 | [email protected] "\'a" |
249 | [email protected] "\'a" | 248 | [email protected] ">" |
250 | [email protected] ">" | 249 | [email protected] " " |
251 | [email protected] " " | 250 | [email protected] |
252 | [email protected] | 251 | [email protected] |
253 | [email protected] | 252 | [email protected] |
254 | [email protected] | 253 | [email protected] |
255 | [email protected] | 254 | [email protected] "Trait" |
256 | [email protected] "Trait" | 255 | [email protected] |
257 | [email protected] | 256 | [email protected] "<" |
258 | [email protected] "<" | 257 | [email protected] |
259 | [email protected] | 258 | [email protected] "\'a" |
260 | [email protected] "\'a" | 259 | [email protected] ">" |
261 | [email protected] ">" | 260 | [email protected] ")" |
262 | [email protected] ")" | 261 | [email protected] " " |
263 | [email protected] " " | 262 | [email protected] "+" |
264 | [email protected] "+" | 263 | [email protected] " " |
265 | [email protected] " " | 264 | [email protected] |
266 | [email protected] | 265 | [email protected] "(" |
267 | [email protected] "(" | 266 | [email protected] |
268 | [email protected] | 267 | [email protected] |
269 | [email protected] | 268 | [email protected] |
270 | [email protected] | 269 | [email protected] |
271 | [email protected] | 270 | [email protected] "Copy" |
272 | [email protected] "Copy" | 271 | [email protected] ")" |
273 | [email protected] ")" | 272 | [email protected] " " |
274 | [email protected] " " | 273 | [email protected] "+" |
275 | [email protected] "+" | 274 | [email protected] " " |
276 | [email protected] " " | 275 | [email protected] |
277 | [email protected] | 276 | [email protected] "(" |
278 | [email protected] "(" | 277 | [email protected] "?" |
279 | [email protected] "?" | 278 | [email protected] |
280 | [email protected] | 279 | [email protected] |
281 | [email protected] | 280 | [email protected] |
282 | [email protected] | 281 | [email protected] |
283 | [email protected] | 282 | [email protected] "Sized" |
284 | [email protected] "Sized" | 283 | [email protected] ")" |
285 | [email protected] ")" | 284 | [email protected] |
286 | [email protected] | 285 | [email protected] |
287 | [email protected] | 286 | [email protected] ">" |
288 | [email protected] ">" | 287 | [email protected] ";" |
289 | [email protected] ";" | 288 | [email protected] "\n" |
290 | [email protected] "\n" | 289 | [email protected] "}" |
291 | [email protected] "}" | ||
292 | [email protected] "\n" | 290 | [email protected] "\n" |
293 | error 88..88: expected COMMA | 291 | error 88..88: expected COMMA |
294 | error 88..88: expected R_ANGLE | 292 | error 88..88: expected R_ANGLE |
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index 195c08bd9..88b086daf 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast | |||
@@ -9,187 +9,185 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "enum" |
16 | [email protected] "enum" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "Test" |
19 | [email protected] "Test" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "Var1" |
26 | [email protected] "Var1" | 26 | [email protected] "," |
27 | [email protected] "," | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "Var2" |
31 | [email protected] "Var2" | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "(" |
33 | [email protected] "(" | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "String" |
39 | [email protected] "String" | 39 | [email protected] ")" |
40 | [email protected] ")" | 40 | [email protected] "," |
41 | [email protected] "," | 41 | [email protected] "\n " |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "Var3" |
45 | [email protected] "Var3" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "{" |
48 | [email protected] "{" | 48 | [email protected] "\n " |
49 | [email protected] "\n " | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "abc" |
52 | [email protected] "abc" | 52 | [email protected] ":" |
53 | [email protected] ":" | 53 | [email protected] " " |
54 | [email protected] " " | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "{" |
56 | [email protected] "{" | 56 | [email protected] "}" |
57 | [email protected] "}" | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "," |
59 | [email protected] "," | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] "//~ ERROR: expected t ..." |
61 | [email protected] "//~ ERROR: expected t ..." | 61 | [email protected] "\n " |
62 | [email protected] "\n " | 62 | [email protected] "}" |
63 | [email protected] "}" | 63 | [email protected] "," |
64 | [email protected] "," | 64 | [email protected] "\n " |
65 | [email protected] "\n " | 65 | [email protected] "}" |
66 | [email protected] "}" | 66 | [email protected] "\n\n " |
67 | [email protected] "\n\n " | 67 | [email protected] "// recover..." |
68 | [email protected] "// recover..." | 68 | [email protected] "\n " |
69 | [email protected] "\n " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "let" |
71 | [email protected] "let" | 71 | [email protected] " " |
72 | [email protected] " " | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "a" |
75 | [email protected] "a" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] "=" |
77 | [email protected] "=" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "1" |
80 | [email protected] "1" | 80 | [email protected] ";" |
81 | [email protected] ";" | 81 | [email protected] "\n " |
82 | [email protected] "\n " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "enum" |
84 | [email protected] "enum" | 84 | [email protected] " " |
85 | [email protected] " " | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] "Test2" |
87 | [email protected] "Test2" | 87 | [email protected] " " |
88 | [email protected] " " | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "{" |
90 | [email protected] "{" | 90 | [email protected] "\n " |
91 | [email protected] "\n " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "Fine" |
94 | [email protected] "Fine" | 94 | [email protected] "," |
95 | [email protected] "," | 95 | [email protected] "\n " |
96 | [email protected] "\n " | 96 | [email protected] "}" |
97 | [email protected] "}" | 97 | [email protected] "\n\n " |
98 | [email protected] "\n\n " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "enum" |
100 | [email protected] "enum" | 100 | [email protected] " " |
101 | [email protected] " " | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] "Test3" |
103 | [email protected] "Test3" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] "{" |
106 | [email protected] "{" | 106 | [email protected] "\n " |
107 | [email protected] "\n " | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] |
109 | [email protected] | 109 | [email protected] "StillFine" |
110 | [email protected] "StillFine" | 110 | [email protected] " " |
111 | [email protected] " " | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] "{" |
113 | [email protected] "{" | 113 | [email protected] "\n " |
114 | [email protected] "\n " | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] "def" |
117 | [email protected] "def" | 117 | [email protected] ":" |
118 | [email protected] ":" | 118 | [email protected] " " |
119 | [email protected] " " | 119 | [email protected] |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] |
122 | [email protected] | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] "i32" |
124 | [email protected] "i32" | 124 | [email protected] "," |
125 | [email protected] "," | 125 | [email protected] "\n " |
126 | [email protected] "\n " | 126 | [email protected] "}" |
127 | [email protected] "}" | 127 | [email protected] "," |
128 | [email protected] "," | 128 | [email protected] "\n " |
129 | [email protected] "\n " | 129 | [email protected] "}" |
130 | [email protected] "}" | 130 | [email protected] "\n\n " |
131 | [email protected] "\n\n " | 131 | [email protected] |
132 | [email protected] | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] "{" |
134 | [email protected] | 134 | [email protected] "\n " |
135 | [email protected] "{" | 135 | [email protected] |
136 | [email protected] "\n " | 136 | [email protected] "// fail again" |
137 | [email protected] | 137 | [email protected] "\n " |
138 | [email protected] "// fail again" | 138 | [email protected] "enum" |
139 | [email protected] "\n " | 139 | [email protected] " " |
140 | [email protected] "enum" | 140 | [email protected] |
141 | [email protected] " " | 141 | [email protected] "Test4" |
142 | [email protected] | 142 | [email protected] " " |
143 | [email protected] "Test4" | 143 | [email protected] |
144 | [email protected] " " | 144 | [email protected] "{" |
145 | [email protected] | 145 | [email protected] "\n " |
146 | [email protected] "{" | 146 | [email protected] |
147 | [email protected] "\n " | 147 | [email protected] |
148 | [email protected] | 148 | [email protected] "Nope" |
149 | [email protected] | 149 | [email protected] |
150 | [email protected] "Nope" | 150 | [email protected] "(" |
151 | [email protected] | 151 | [email protected] |
152 | [email protected] "(" | 152 | [email protected] |
153 | [email protected] | 153 | [email protected] |
154 | [email protected] | 154 | [email protected] |
155 | [email protected] | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] "i32" |
157 | [email protected] | 157 | [email protected] " " |
158 | [email protected] "i32" | 158 | [email protected] |
159 | [email protected] " " | 159 | [email protected] |
160 | [email protected] | 160 | [email protected] "{" |
161 | [email protected] | 161 | [email protected] "}" |
162 | [email protected] "{" | 162 | [email protected] |
163 | [email protected] "}" | 163 | [email protected] ")" |
164 | [email protected] | 164 | [email protected] " " |
165 | [email protected] ")" | 165 | [email protected] "//~ ERROR: found `{`" |
166 | [email protected] " " | 166 | [email protected] "\n ..." |
167 | [email protected] "//~ ERROR: found `{`" | 167 | [email protected] "//~^ ERROR: found `{`" |
168 | [email protected] "\n ..." | 168 | [email protected] "\n " |
169 | [email protected] "//~^ ERROR: found `{`" | 169 | [email protected] "}" |
170 | [email protected] "\n " | 170 | [email protected] "\n " |
171 | [email protected] "}" | 171 | [email protected] "}" |
172 | [email protected] "\n " | 172 | [email protected] "\n " |
173 | [email protected] "}" | 173 | [email protected] "// still recover later" |
174 | [email protected] "\n " | 174 | [email protected] "\n " |
175 | [email protected] "// still recover later" | 175 | [email protected] |
176 | [email protected] "\n " | 176 | [email protected] "let" |
177 | [email protected] | 177 | [email protected] " " |
178 | [email protected] "let" | 178 | [email protected] |
179 | [email protected] " " | 179 | [email protected] |
180 | [email protected] | 180 | [email protected] "bad_syntax" |
181 | [email protected] | 181 | [email protected] " " |
182 | [email protected] "bad_syntax" | 182 | [email protected] "=" |
183 | [email protected] " " | 183 | [email protected] " " |
184 | [email protected] "=" | 184 | [email protected] |
185 | [email protected] " " | 185 | [email protected] "_" |
186 | [email protected] | 186 | [email protected] ";" |
187 | [email protected] "_" | 187 | [email protected] " " |
188 | [email protected] ";" | 188 | [email protected] "//~ ERROR: expected e ..." |
189 | [email protected] " " | 189 | [email protected] "\n" |
190 | [email protected] "//~ ERROR: expected e ..." | 190 | [email protected] "}" |
191 | [email protected] "\n" | ||
192 | [email protected] "}" | ||
193 | [email protected] "\n" | 191 | [email protected] "\n" |
194 | error 95..95: expected type | 192 | error 95..95: expected type |
195 | error 95..95: expected COMMA | 193 | error 95..95: expected COMMA |
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast index f2fada510..568a4cc02 100644 --- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast +++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast | |||
@@ -21,9 +21,8 @@ [email protected] | |||
21 | [email protected] ">" | 21 | [email protected] ">" |
22 | [email protected] "\n" | 22 | [email protected] "\n" |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] "{" | 25 | [email protected] "}" |
26 | [email protected] "}" | ||
27 | [email protected] "\n" | 26 | [email protected] "\n" |
28 | error 26..26: expected a path | 27 | error 26..26: expected a path |
29 | error 26..26: expected colon | 28 | error 26..26: expected colon |
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast index 56682f966..0da8f59f0 100644 --- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast +++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast | |||
@@ -20,17 +20,16 @@ [email protected] | |||
20 | [email protected] ")" | 20 | [email protected] ")" |
21 | [email protected] " " | 21 | [email protected] " " |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "a" |
31 | [email protected] "a" | 31 | [email protected] "." |
32 | [email protected] "." | 32 | [email protected] "\n" |
33 | [email protected] "\n" | 33 | [email protected] "}" |
34 | [email protected] "}" | ||
35 | [email protected] "\n" | 34 | [email protected] "\n" |
36 | error 21..21: expected field name or number | 35 | error 21..21: expected field name or number |
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast index aac476430..515819e42 100644 --- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast | |||
@@ -9,115 +9,111 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "inner" |
20 | [email protected] "inner" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] | 25 | [email protected] "\n " |
26 | [email protected] "{" | 26 | [email protected] |
27 | [email protected] "\n " | 27 | [email protected] "#" |
28 | [email protected] | 28 | [email protected] "!" |
29 | [email protected] "#" | 29 | [email protected] "[" |
30 | [email protected] "!" | 30 | [email protected] |
31 | [email protected] "[" | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "doc" |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] "doc" | 35 | [email protected] "(" |
36 | [email protected] | 36 | [email protected] "\"Inner attributes not ..." |
37 | [email protected] "(" | 37 | [email protected] ")" |
38 | [email protected] "\"Inner attributes not ..." | 38 | [email protected] "]" |
39 | [email protected] ")" | 39 | [email protected] "\n " |
40 | [email protected] "]" | 40 | [email protected] "//! Nor are ModuleDoc ..." |
41 | [email protected] "\n " | 41 | [email protected] "\n " |
42 | [email protected] "//! Nor are ModuleDoc ..." | 42 | [email protected] "}" |
43 | [email protected] "\n " | 43 | [email protected] ";" |
44 | [email protected] "}" | 44 | [email protected] "\n " |
45 | [email protected] ";" | 45 | [email protected] |
46 | [email protected] "\n " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "if" |
48 | [email protected] | 48 | [email protected] " " |
49 | [email protected] "if" | 49 | [email protected] |
50 | [email protected] " " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "true" |
52 | [email protected] | 52 | [email protected] " " |
53 | [email protected] "true" | 53 | [email protected] |
54 | [email protected] " " | 54 | [email protected] "{" |
55 | [email protected] | 55 | [email protected] "\n " |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] "{" | 57 | [email protected] "#" |
58 | [email protected] "\n " | 58 | [email protected] "!" |
59 | [email protected] | 59 | [email protected] "[" |
60 | [email protected] "#" | 60 | [email protected] |
61 | [email protected] "!" | 61 | [email protected] |
62 | [email protected] "[" | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "doc" |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "(" |
66 | [email protected] "doc" | 66 | [email protected] "\"Nor here\"" |
67 | [email protected] | 67 | [email protected] ")" |
68 | [email protected] "(" | 68 | [email protected] "]" |
69 | [email protected] "\"Nor here\"" | 69 | [email protected] "\n " |
70 | [email protected] ")" | 70 | [email protected] |
71 | [email protected] "]" | 71 | [email protected] "#" |
72 | [email protected] "\n " | 72 | [email protected] "!" |
73 | [email protected] | 73 | [email protected] "[" |
74 | [email protected] "#" | 74 | [email protected] |
75 | [email protected] "!" | 75 | [email protected] |
76 | [email protected] "[" | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "doc" |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "(" |
80 | [email protected] "doc" | 80 | [email protected] "\"We error on each attr\"" |
81 | [email protected] | 81 | [email protected] ")" |
82 | [email protected] "(" | 82 | [email protected] "]" |
83 | [email protected] "\"We error on each attr\"" | 83 | [email protected] "\n " |
84 | [email protected] ")" | 84 | [email protected] "//! Nor are ModuleDoc ..." |
85 | [email protected] "]" | 85 | [email protected] "\n " |
86 | [email protected] "\n " | 86 | [email protected] "}" |
87 | [email protected] "//! Nor are ModuleDoc ..." | 87 | [email protected] "\n " |
88 | [email protected] "\n " | 88 | [email protected] |
89 | [email protected] "}" | 89 | [email protected] "while" |
90 | [email protected] "\n " | 90 | [email protected] " " |
91 | [email protected] | 91 | [email protected] |
92 | [email protected] "while" | 92 | [email protected] |
93 | [email protected] " " | 93 | [email protected] "true" |
94 | [email protected] | 94 | [email protected] " " |
95 | [email protected] | 95 | [email protected] |
96 | [email protected] "true" | 96 | [email protected] "{" |
97 | [email protected] " " | 97 | [email protected] "\n " |
98 | [email protected] | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "#" |
100 | [email protected] "{" | 100 | [email protected] "!" |
101 | [email protected] "\n " | 101 | [email protected] "[" |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] "#" | 103 | [email protected] |
104 | [email protected] "!" | 104 | [email protected] |
105 | [email protected] "[" | 105 | [email protected] "doc" |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] "(" |
108 | [email protected] | 108 | [email protected] "\"Nor here\"" |
109 | [email protected] "doc" | 109 | [email protected] ")" |
110 | [email protected] | 110 | [email protected] "]" |
111 | [email protected] "(" | 111 | [email protected] "\n " |
112 | [email protected] "\"Nor here\"" | 112 | [email protected] "//! Nor are ModuleDoc ..." |
113 | [email protected] ")" | 113 | [email protected] "\n " |
114 | [email protected] "]" | 114 | [email protected] "}" |
115 | [email protected] "\n " | 115 | [email protected] "\n" |
116 | [email protected] "//! Nor are ModuleDoc ..." | 116 | [email protected] "}" |
117 | [email protected] "\n " | ||
118 | [email protected] "}" | ||
119 | [email protected] "\n" | ||
120 | [email protected] "}" | ||
121 | [email protected] "\n" | 117 | [email protected] "\n" |
122 | error 39..83: A block in this position cannot accept inner attributes | 118 | error 39..83: A block in this position cannot accept inner attributes |
123 | error 152..171: A block in this position cannot accept inner attributes | 119 | error 152..171: A block in this position cannot accept inner attributes |
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast index f98de7f15..c6859eca8 100644 --- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast | |||
@@ -9,187 +9,186 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "match" |
17 | [email protected] "match" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "(" |
20 | [email protected] "(" | 20 | [email protected] ")" |
21 | [email protected] ")" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "_" |
28 | [email protected] "_" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "=>" |
30 | [email protected] "=>" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "(" |
33 | [email protected] "(" | 33 | [email protected] ")" |
34 | [email protected] ")" | 34 | [email protected] "," |
35 | [email protected] "," | 35 | [email protected] "\n " |
36 | [email protected] "\n " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "#" |
39 | [email protected] "#" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "!" |
41 | [email protected] "!" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "[" |
43 | [email protected] "[" | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "doc" |
49 | [email protected] "doc" | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "(" |
51 | [email protected] "(" | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "\"Not allowed here\"" |
53 | [email protected] "\"Not allowed here\"" | 53 | [email protected] ")" |
54 | [email protected] ")" | 54 | [email protected] "]" |
55 | [email protected] "]" | 55 | [email protected] "\n " |
56 | [email protected] "\n " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "_" |
59 | [email protected] "_" | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] "=>" |
61 | [email protected] "=>" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "(" |
64 | [email protected] "(" | 64 | [email protected] ")" |
65 | [email protected] ")" | 65 | [email protected] "," |
66 | [email protected] "," | 66 | [email protected] "\n " |
67 | [email protected] "\n " | 67 | [email protected] "}" |
68 | [email protected] "}" | 68 | [email protected] "\n\n " |
69 | [email protected] "\n\n " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "match" |
72 | [email protected] "match" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "(" |
75 | [email protected] "(" | 75 | [email protected] ")" |
76 | [email protected] ")" | 76 | [email protected] " " |
77 | [email protected] " " | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] "{" |
79 | [email protected] "{" | 79 | [email protected] "\n " |
80 | [email protected] "\n " | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "_" |
83 | [email protected] "_" | 83 | [email protected] " " |
84 | [email protected] " " | 84 | [email protected] "=>" |
85 | [email protected] "=>" | 85 | [email protected] " " |
86 | [email protected] " " | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "(" |
88 | [email protected] "(" | 88 | [email protected] ")" |
89 | [email protected] ")" | 89 | [email protected] "," |
90 | [email protected] "," | 90 | [email protected] "\n " |
91 | [email protected] "\n " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "_" |
94 | [email protected] "_" | 94 | [email protected] " " |
95 | [email protected] " " | 95 | [email protected] "=>" |
96 | [email protected] "=>" | 96 | [email protected] " " |
97 | [email protected] " " | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "(" |
99 | [email protected] "(" | 99 | [email protected] ")" |
100 | [email protected] ")" | 100 | [email protected] "," |
101 | [email protected] "," | 101 | [email protected] "\n " |
102 | [email protected] "\n " | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "#" |
105 | [email protected] "#" | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] "!" |
107 | [email protected] "!" | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "[" |
109 | [email protected] "[" | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] |
113 | [email protected] | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] "doc" |
115 | [email protected] "doc" | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] "(" |
117 | [email protected] "(" | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] "\"Nor here\"" |
119 | [email protected] "\"Nor here\"" | 119 | [email protected] ")" |
120 | [email protected] ")" | 120 | [email protected] "]" |
121 | [email protected] "]" | 121 | [email protected] "\n " |
122 | [email protected] "\n " | 122 | [email protected] "}" |
123 | [email protected] "}" | 123 | [email protected] "\n\n " |
124 | [email protected] "\n\n " | 124 | [email protected] |
125 | [email protected] | 125 | [email protected] "match" |
126 | [email protected] "match" | 126 | [email protected] " " |
127 | [email protected] " " | 127 | [email protected] |
128 | [email protected] | 128 | [email protected] "(" |
129 | [email protected] "(" | 129 | [email protected] ")" |
130 | [email protected] ")" | 130 | [email protected] " " |
131 | [email protected] " " | 131 | [email protected] |
132 | [email protected] | 132 | [email protected] "{" |
133 | [email protected] "{" | 133 | [email protected] "\n " |
134 | [email protected] "\n " | 134 | [email protected] |
135 | [email protected] | 135 | [email protected] |
136 | [email protected] | 136 | [email protected] "#" |
137 | [email protected] "#" | 137 | [email protected] "[" |
138 | [email protected] "[" | 138 | [email protected] |
139 | [email protected] | 139 | [email protected] |
140 | [email protected] | 140 | [email protected] |
141 | [email protected] | 141 | [email protected] "cfg" |
142 | [email protected] "cfg" | 142 | [email protected] |
143 | [email protected] | 143 | [email protected] "(" |
144 | [email protected] "(" | 144 | [email protected] "test" |
145 | [email protected] "test" | 145 | [email protected] ")" |
146 | [email protected] ")" | 146 | [email protected] "]" |
147 | [email protected] "]" | 147 | [email protected] "\n " |
148 | [email protected] "\n " | 148 | [email protected] |
149 | [email protected] | 149 | [email protected] "#" |
150 | [email protected] "#" | 150 | [email protected] |
151 | [email protected] | 151 | [email protected] "!" |
152 | [email protected] "!" | 152 | [email protected] |
153 | [email protected] | 153 | [email protected] "[" |
154 | [email protected] "[" | 154 | [email protected] |
155 | [email protected] | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] |
157 | [email protected] | 157 | [email protected] |
158 | [email protected] | 158 | [email protected] |
159 | [email protected] | 159 | [email protected] "doc" |
160 | [email protected] "doc" | 160 | [email protected] |
161 | [email protected] | 161 | [email protected] "(" |
162 | [email protected] "(" | 162 | [email protected] |
163 | [email protected] | 163 | [email protected] "\"Nor here\"" |
164 | [email protected] "\"Nor here\"" | 164 | [email protected] ")" |
165 | [email protected] ")" | 165 | [email protected] "]" |
166 | [email protected] "]" | 166 | [email protected] "\n " |
167 | [email protected] "\n " | 167 | [email protected] |
168 | [email protected] | 168 | [email protected] |
169 | [email protected] | 169 | [email protected] "_" |
170 | [email protected] "_" | 170 | [email protected] " " |
171 | [email protected] " " | 171 | [email protected] "=>" |
172 | [email protected] "=>" | 172 | [email protected] " " |
173 | [email protected] " " | 173 | [email protected] |
174 | [email protected] | 174 | [email protected] "(" |
175 | [email protected] "(" | 175 | [email protected] ")" |
176 | [email protected] ")" | 176 | [email protected] "," |
177 | [email protected] "," | 177 | [email protected] "\n " |
178 | [email protected] "\n " | 178 | [email protected] |
179 | [email protected] | 179 | [email protected] |
180 | [email protected] | 180 | [email protected] "_" |
181 | [email protected] "_" | 181 | [email protected] " " |
182 | [email protected] " " | 182 | [email protected] "=>" |
183 | [email protected] "=>" | 183 | [email protected] " " |
184 | [email protected] " " | 184 | [email protected] |
185 | [email protected] | 185 | [email protected] "(" |
186 | [email protected] "(" | 186 | [email protected] ")" |
187 | [email protected] ")" | 187 | [email protected] "," |
188 | [email protected] "," | 188 | [email protected] "\n " |
189 | [email protected] "\n " | 189 | [email protected] "}" |
190 | [email protected] "}" | 190 | [email protected] "\n" |
191 | [email protected] "\n" | 191 | [email protected] "}" |
192 | [email protected] "}" | ||
193 | [email protected] "\n" | 192 | [email protected] "\n" |
194 | error 52..52: expected `[` | 193 | error 52..52: expected `[` |
195 | error 52..52: expected pattern | 194 | error 52..52: expected pattern |
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast index d0017c883..53e445459 100644 --- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast | |||
@@ -9,58 +9,57 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "_" |
27 | [email protected] "_" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "=>" |
29 | [email protected] "=>" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] "," |
34 | [email protected] "," | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "_" |
38 | [email protected] "_" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] "=>" |
40 | [email protected] "=>" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "(" |
43 | [email protected] "(" | 43 | [email protected] ")" |
44 | [email protected] ")" | 44 | [email protected] "," |
45 | [email protected] "," | 45 | [email protected] "\n " |
46 | [email protected] "\n " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "#" |
49 | [email protected] "#" | 49 | [email protected] "[" |
50 | [email protected] "[" | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "cfg" |
54 | [email protected] "cfg" | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "(" |
56 | [email protected] "(" | 56 | [email protected] "test" |
57 | [email protected] "test" | 57 | [email protected] ")" |
58 | [email protected] ")" | 58 | [email protected] "]" |
59 | [email protected] "]" | 59 | [email protected] "\n " |
60 | [email protected] "\n " | 60 | [email protected] "}" |
61 | [email protected] "}" | 61 | [email protected] "\n" |
62 | [email protected] "\n" | 62 | [email protected] "}" |
63 | [email protected] "}" | ||
64 | [email protected] "\n" | 63 | [email protected] "\n" |
65 | error 80..80: expected pattern | 64 | error 80..80: expected pattern |
66 | error 80..80: expected FAT_ARROW | 65 | error 80..80: expected FAT_ARROW |
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast index 2c0bddec8..1b2ac5011 100644 --- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast +++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast | |||
@@ -9,84 +9,83 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "ref" |
19 | [email protected] "ref" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "box" |
22 | [email protected] "box" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "i" |
30 | [email protected] "i" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] "=" |
32 | [email protected] "=" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "(" |
35 | [email protected] "(" | 35 | [email protected] ")" |
36 | [email protected] ")" | 36 | [email protected] ";" |
37 | [email protected] ";" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "let" |
40 | [email protected] "let" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "mut" |
43 | [email protected] "mut" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "box" |
46 | [email protected] "box" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "i" |
54 | [email protected] "i" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] "=" |
56 | [email protected] "=" | 56 | [email protected] " " |
57 | [email protected] " " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "(" |
59 | [email protected] "(" | 59 | [email protected] ")" |
60 | [email protected] ")" | 60 | [email protected] ";" |
61 | [email protected] ";" | 61 | [email protected] "\n " |
62 | [email protected] "\n " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "let" |
64 | [email protected] "let" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "ref" |
67 | [email protected] "ref" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] "mut" |
69 | [email protected] "mut" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "box" |
72 | [email protected] "box" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "i" |
80 | [email protected] "i" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "=" |
82 | [email protected] "=" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "(" |
85 | [email protected] "(" | 85 | [email protected] ")" |
86 | [email protected] ")" | 86 | [email protected] ";" |
87 | [email protected] ";" | 87 | [email protected] "\n" |
88 | [email protected] "\n" | 88 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n\n" | 89 | [email protected] "\n\n" |
91 | error 24..24: expected a name | 90 | error 24..24: expected a name |
92 | error 27..27: expected SEMICOLON | 91 | error 27..27: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast index 83851f5d2..9588cf3b3 100644 --- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast | |||
@@ -44,9 +44,8 @@ [email protected] | |||
44 | [email protected] ")" | 44 | [email protected] ")" |
45 | [email protected] " " | 45 | [email protected] " " |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "{" |
48 | [email protected] "{" | 48 | [email protected] "}" |
49 | [email protected] "}" | ||
50 | [email protected] "\n" | 49 | [email protected] "\n" |
51 | error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 50 | error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
52 | error 17..17: expected SEMICOLON | 51 | error 17..17: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index a328222aa..e3cda7c43 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | |||
@@ -27,9 +27,8 @@ [email protected] | |||
27 | [email protected] ")" | 27 | [email protected] ")" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "{" |
31 | [email protected] "{" | 31 | [email protected] "}" |
32 | [email protected] "}" | ||
33 | [email protected] "\n " | 32 | [email protected] "\n " |
34 | [email protected] | 33 | [email protected] |
35 | [email protected] | 34 | [email protected] |
@@ -44,9 +43,8 @@ [email protected] | |||
44 | [email protected] ")" | 43 | [email protected] ")" |
45 | [email protected] " " | 44 | [email protected] " " |
46 | [email protected] | 45 | [email protected] |
47 | [email protected] | 46 | [email protected] "{" |
48 | [email protected] "{" | 47 | [email protected] "}" |
49 | [email protected] "}" | ||
50 | [email protected] "\n " | 48 | [email protected] "\n " |
51 | [email protected] | 49 | [email protected] |
52 | [email protected] | 50 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast index bcd1fad69..21db9ee85 100644 --- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast +++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast | |||
@@ -9,22 +9,21 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "0" |
18 | [email protected] "0" | 18 | [email protected] "..=" |
19 | [email protected] "..=" | 19 | [email protected] ";" |
20 | [email protected] ";" | 20 | [email protected] "\n " |
21 | [email protected] "\n " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "..=" |
24 | [email protected] "..=" | 24 | [email protected] ";" |
25 | [email protected] ";" | 25 | [email protected] "\n" |
26 | [email protected] "\n" | 26 | [email protected] "}" |
27 | [email protected] "}" | ||
28 | [email protected] "\n" | 27 | [email protected] "\n" |
29 | error 16..20: An inclusive range must have an end expression | 28 | error 16..20: An inclusive range must have an end expression |
30 | error 26..29: An inclusive range must have an end expression | 29 | error 26..29: An inclusive range must have an end expression |
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast index 433ea7bad..ec950381b 100644 --- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | |||
@@ -18,66 +18,65 @@ [email protected] | |||
18 | [email protected] "i32" | 18 | [email protected] "i32" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "[" |
29 | [email protected] "[" | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "1" |
31 | [email protected] "1" | 31 | [email protected] "," |
32 | [email protected] "," | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "2" |
35 | [email protected] "2" | 35 | [email protected] "," |
36 | [email protected] "," | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "3" |
39 | [email protected] "3" | 39 | [email protected] "]" |
40 | [email protected] "]" | 40 | [email protected] "." |
41 | [email protected] "." | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "iter" |
43 | [email protected] "iter" | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "(" |
45 | [email protected] "(" | 45 | [email protected] ")" |
46 | [email protected] ")" | 46 | [email protected] "\n " |
47 | [email protected] "\n " | 47 | [email protected] "." |
48 | [email protected] "." | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "map" |
50 | [email protected] "map" | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "(" |
52 | [email protected] "(" | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "|" |
55 | [email protected] "|" | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "it" |
59 | [email protected] "it" | 59 | [email protected] "|" |
60 | [email protected] "|" | 60 | [email protected] ")" |
61 | [email protected] ")" | 61 | [email protected] "\n " |
62 | [email protected] "\n " | 62 | [email protected] "." |
63 | [email protected] "." | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "max" |
65 | [email protected] "max" | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "::" |
67 | [email protected] "::" | 67 | [email protected] "<" |
68 | [email protected] "<" | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "i32" |
74 | [email protected] "i32" | 74 | [email protected] ">" |
75 | [email protected] ">" | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "(" |
77 | [email protected] "(" | 77 | [email protected] ")" |
78 | [email protected] ")" | 78 | [email protected] ";" |
79 | [email protected] ";" | 79 | [email protected] "\n" |
80 | [email protected] "\n" | 80 | [email protected] "}" |
81 | [email protected] "}" | ||
82 | [email protected] "\n" | 81 | [email protected] "\n" |
83 | error 56..56: expected expression | 82 | error 56..56: expected expression |
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast new file mode 100644 index 000000000..e46456384 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast | |||
@@ -0,0 +1,71 @@ | |||
1 | [email protected] | ||
2 | [email protected] | ||
3 | [email protected] "fn" | ||
4 | [email protected] " " | ||
5 | [email protected] | ||
6 | [email protected] "main" | ||
7 | [email protected] | ||
8 | [email protected] "(" | ||
9 | [email protected] ")" | ||
10 | [email protected] " " | ||
11 | [email protected] | ||
12 | [email protected] "{" | ||
13 | [email protected] "\n " | ||
14 | [email protected] | ||
15 | [email protected] | ||
16 | [email protected] "{" | ||
17 | [email protected] " " | ||
18 | [email protected] | ||
19 | [email protected] "unsafe" | ||
20 | [email protected] " " | ||
21 | [email protected] | ||
22 | [email protected] "92" | ||
23 | [email protected] " " | ||
24 | [email protected] "}" | ||
25 | [email protected] "\n " | ||
26 | [email protected] | ||
27 | [email protected] | ||
28 | [email protected] "{" | ||
29 | [email protected] " " | ||
30 | [email protected] | ||
31 | [email protected] "async" | ||
32 | [email protected] " " | ||
33 | [email protected] | ||
34 | [email protected] "92" | ||
35 | [email protected] " " | ||
36 | [email protected] "}" | ||
37 | [email protected] "\n " | ||
38 | [email protected] | ||
39 | [email protected] | ||
40 | [email protected] "{" | ||
41 | [email protected] " " | ||
42 | [email protected] | ||
43 | [email protected] | ||
44 | [email protected] "try" | ||
45 | [email protected] " " | ||
46 | [email protected] | ||
47 | [email protected] "92" | ||
48 | [email protected] " " | ||
49 | [email protected] "}" | ||
50 | [email protected] "\n " | ||
51 | [email protected] | ||
52 | [email protected] "{" | ||
53 | [email protected] " " | ||
54 | [email protected] | ||
55 | [email protected] | ||
56 | [email protected] | ||
57 | [email protected] "\'label" | ||
58 | [email protected] ":" | ||
59 | [email protected] " " | ||
60 | [email protected] | ||
61 | [email protected] "92" | ||
62 | [email protected] " " | ||
63 | [email protected] "}" | ||
64 | [email protected] "\n" | ||
65 | [email protected] "}" | ||
66 | [email protected] "\n" | ||
67 | error 24..24: expected existential, fn, trait or impl | ||
68 | error 41..41: expected existential, fn, trait or impl | ||
69 | error 56..56: expected a block | ||
70 | error 75..75: expected a loop | ||
71 | error 75..75: expected SEMICOLON | ||
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs new file mode 100644 index 000000000..8fa324c1a --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs | |||
@@ -0,0 +1,6 @@ | |||
1 | fn main() { | ||
2 | { unsafe 92 } | ||
3 | { async 92 } | ||
4 | { try 92 } | ||
5 | { 'label: 92 } | ||
6 | } | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index 85bf276a0..75668c818 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast | |||
@@ -9,19 +9,18 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "\'loop" |
18 | [email protected] "\'loop" | 18 | [email protected] ":" |
19 | [email protected] ":" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "impl" |
22 | [email protected] "impl" | 22 | [email protected] "\n" |
23 | [email protected] "\n" | 23 | [email protected] "}" |
24 | [email protected] "}" | ||
25 | [email protected] "\n" | 24 | [email protected] "\n" |
26 | error 22..22: expected a loop | 25 | error 22..22: expected a loop |
27 | error 22..22: expected SEMICOLON | 26 | error 22..22: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast index b901c17f7..c789e8d82 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast | |||
@@ -8,9 +8,8 @@ [email protected] | |||
8 | [email protected] "(" | 8 | [email protected] "(" |
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] | 10 | [email protected] |
11 | [email protected] | 11 | [email protected] "{" |
12 | [email protected] "{" | 12 | [email protected] "}" |
13 | [email protected] "}" | ||
14 | [email protected] " " | 13 | [email protected] " " |
15 | [email protected] | 14 | [email protected] |
16 | [email protected] "unsafe" | 15 | [email protected] "unsafe" |
@@ -29,9 +28,8 @@ [email protected] | |||
29 | [email protected] "(" | 28 | [email protected] "(" |
30 | [email protected] ")" | 29 | [email protected] ")" |
31 | [email protected] | 30 | [email protected] |
32 | [email protected] | 31 | [email protected] "{" |
33 | [email protected] "{" | 32 | [email protected] "}" |
34 | [email protected] "}" | ||
35 | [email protected] "\n" | 33 | [email protected] "\n" |
36 | error 11..11: expected an item | 34 | error 11..11: expected an item |
37 | error 18..18: expected an item | 35 | error 18..18: expected an item |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast index 3f48b86ed..cd24313d4 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast | |||
@@ -9,24 +9,23 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "async" |
24 | [email protected] "async" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] "{" | 27 | [email protected] "}" |
28 | [email protected] "}" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "}" |
30 | [email protected] "}" | ||
31 | [email protected] "\n" | 30 | [email protected] "\n" |
32 | error 27..27: expected SEMICOLON | 31 | error 27..27: expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast index be02eaeeb..c5fa7a404 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast | |||
@@ -9,18 +9,17 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "pub" |
17 | [email protected] "pub" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "92" |
21 | [email protected] "92" | 21 | [email protected] ";" |
22 | [email protected] ";" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] "}" |
24 | [email protected] "}" | ||
25 | [email protected] "\n" | 24 | [email protected] "\n" |
26 | error 14..14: expected an item | 25 | error 14..14: expected an item |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast index b344e4f7f..0656fdf73 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast | |||
@@ -9,53 +9,51 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "#" |
17 | [email protected] "#" | 17 | [email protected] "[" |
18 | [email protected] "[" | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "A" |
22 | [email protected] "A" | 22 | [email protected] "]" |
23 | [email protected] "]" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "1" |
27 | [email protected] "1" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "+" |
29 | [email protected] "+" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "2" |
32 | [email protected] "2" | 32 | [email protected] ";" |
33 | [email protected] ";" | 33 | [email protected] "\n " |
34 | [email protected] "\n " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "#" |
37 | [email protected] "#" | 37 | [email protected] "[" |
38 | [email protected] "[" | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "B" |
42 | [email protected] "B" | 42 | [email protected] "]" |
43 | [email protected] "]" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "if" |
46 | [email protected] "if" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "true" |
50 | [email protected] "true" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "{" |
53 | [email protected] | 53 | [email protected] "}" |
54 | [email protected] "{" | 54 | [email protected] ";" |
55 | [email protected] "}" | 55 | [email protected] "\n" |
56 | [email protected] ";" | 56 | [email protected] "}" |
57 | [email protected] "\n" | ||
58 | [email protected] "}" | ||
59 | [email protected] "\n" | 57 | [email protected] "\n" |
60 | error 24..24: attributes are not allowed on BIN_EXPR | 58 | error 24..24: attributes are not allowed on BIN_EXPR |
61 | error 44..44: attributes are not allowed on IF_EXPR | 59 | error 44..44: attributes are not allowed on IF_EXPR |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast index 5339a84d7..e1abc5633 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast | |||
@@ -9,45 +9,44 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] "." |
22 | [email protected] "." | 22 | [email protected] "0." |
23 | [email protected] "0." | 23 | [email protected] ";" |
24 | [email protected] ";" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "x" |
32 | [email protected] "x" | 32 | [email protected] "." |
33 | [email protected] "." | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "1i32" |
35 | [email protected] "1i32" | 35 | [email protected] ";" |
36 | [email protected] ";" | 36 | [email protected] "\n " |
37 | [email protected] "\n " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "x" |
44 | [email protected] "x" | 44 | [email protected] "." |
45 | [email protected] "." | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "0x01" |
47 | [email protected] "0x01" | 47 | [email protected] ";" |
48 | [email protected] ";" | 48 | [email protected] "\n" |
49 | [email protected] "\n" | 49 | [email protected] "}" |
50 | [email protected] "}" | ||
51 | [email protected] "\n" | 50 | [email protected] "\n" |
52 | error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix | 51 | error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix |
53 | error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix | 52 | error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index 20ed39046..9be441110 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast | |||
@@ -14,9 +14,8 @@ [email protected] | |||
14 | [email protected] ")" | 14 | [email protected] ")" |
15 | [email protected] " " | 15 | [email protected] " " |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "{" |
18 | [email protected] "{" | 18 | [email protected] "}" |
19 | [email protected] "}" | ||
20 | [email protected] "\n" | 19 | [email protected] "\n" |
21 | [email protected] | 20 | [email protected] |
22 | [email protected] "unsafe" | 21 | [email protected] "unsafe" |
@@ -33,9 +32,8 @@ [email protected] | |||
33 | [email protected] ")" | 32 | [email protected] ")" |
34 | [email protected] " " | 33 | [email protected] " " |
35 | [email protected] | 34 | [email protected] |
36 | [email protected] | 35 | [email protected] "{" |
37 | [email protected] "{" | 36 | [email protected] "}" |
38 | [email protected] "}" | ||
39 | [email protected] "\n" | 37 | [email protected] "\n" |
40 | error 6..6: expected existential, fn, trait or impl | 38 | error 6..6: expected existential, fn, trait or impl |
41 | error 31..31: expected existential, fn, trait or impl | 39 | error 31..31: expected existential, fn, trait or impl |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index 88567263e..b8cd0587d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast | |||
@@ -45,9 +45,8 @@ [email protected] | |||
45 | [email protected] ")" | 45 | [email protected] ")" |
46 | [email protected] " " | 46 | [email protected] " " |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "{" |
49 | [email protected] "{" | 49 | [email protected] "}" |
50 | [email protected] "}" | ||
51 | [email protected] "\n" | 50 | [email protected] "\n" |
52 | [email protected] "}" | 51 | [email protected] "}" |
53 | [email protected] "\n" | 52 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast index 578befa56..a9de44b57 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast | |||
@@ -9,41 +9,40 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "S" |
19 | [email protected] "S" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "field" |
26 | [email protected] "field" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] ".." |
29 | [email protected] ".." | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "S" |
36 | [email protected] "S" | 36 | [email protected] "::" |
37 | [email protected] "::" | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "default" |
40 | [email protected] "default" | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "(" |
42 | [email protected] "(" | 42 | [email protected] ")" |
43 | [email protected] ")" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "}" |
45 | [email protected] "}" | 45 | [email protected] "\n" |
46 | [email protected] "\n" | 46 | [email protected] "}" |
47 | [email protected] "}" | ||
48 | [email protected] "\n" | 47 | [email protected] "\n" |
49 | error 25..25: expected COLON | 48 | error 25..25: expected COLON |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast index a1fabb557..a38b4f573 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast | |||
@@ -51,9 +51,8 @@ [email protected] | |||
51 | [email protected] ")" | 51 | [email protected] ")" |
52 | [email protected] " " | 52 | [email protected] " " |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "{" |
55 | [email protected] "{" | 55 | [email protected] "}" |
56 | [email protected] "}" | ||
57 | [email protected] "\n " | 56 | [email protected] "\n " |
58 | [email protected] | 57 | [email protected] |
59 | [email protected] "fn" | 58 | [email protected] "fn" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast index a46d76fde..9dc473e43 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast | |||
@@ -55,8 +55,7 @@ [email protected] | |||
55 | [email protected] ")" | 55 | [email protected] ")" |
56 | [email protected] "\n" | 56 | [email protected] "\n" |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "{" |
59 | [email protected] "{" | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] "}" |
61 | [email protected] "}" | ||
62 | [email protected] "\n" | 61 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast index 5181fcd2b..6c8c1e24b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast | |||
@@ -32,7 +32,6 @@ [email protected] | |||
32 | [email protected] "(" | 32 | [email protected] "(" |
33 | [email protected] ")" | 33 | [email protected] ")" |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "{" |
36 | [email protected] "{" | 36 | [email protected] "}" |
37 | [email protected] "}" | ||
38 | [email protected] "\n" | 37 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast index dd41b44e1..9f4a9e69b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast | |||
@@ -23,9 +23,8 @@ [email protected] | |||
23 | [email protected] ")" | 23 | [email protected] ")" |
24 | [email protected] " " | 24 | [email protected] " " |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] "{" | 27 | [email protected] "}" |
28 | [email protected] "}" | ||
29 | [email protected] "\n " | 28 | [email protected] "\n " |
30 | [email protected] | 29 | [email protected] |
31 | [email protected] "fn" | 30 | [email protected] "fn" |
@@ -41,9 +40,8 @@ [email protected] | |||
41 | [email protected] ")" | 40 | [email protected] ")" |
42 | [email protected] " " | 41 | [email protected] " " |
43 | [email protected] | 42 | [email protected] |
44 | [email protected] | 43 | [email protected] "{" |
45 | [email protected] "{" | 44 | [email protected] "}" |
46 | [email protected] "}" | ||
47 | [email protected] "\n " | 45 | [email protected] "\n " |
48 | [email protected] | 46 | [email protected] |
49 | [email protected] "fn" | 47 | [email protected] "fn" |
@@ -61,9 +59,8 @@ [email protected] | |||
61 | [email protected] ")" | 59 | [email protected] ")" |
62 | [email protected] " " | 60 | [email protected] " " |
63 | [email protected] | 61 | [email protected] |
64 | [email protected] | 62 | [email protected] "{" |
65 | [email protected] "{" | 63 | [email protected] "}" |
66 | [email protected] "}" | ||
67 | [email protected] "\n " | 64 | [email protected] "\n " |
68 | [email protected] | 65 | [email protected] |
69 | [email protected] "fn" | 66 | [email protected] "fn" |
@@ -95,9 +92,8 @@ [email protected] | |||
95 | [email protected] ")" | 92 | [email protected] ")" |
96 | [email protected] " " | 93 | [email protected] " " |
97 | [email protected] | 94 | [email protected] |
98 | [email protected] | 95 | [email protected] "{" |
99 | [email protected] "{" | 96 | [email protected] "}" |
100 | [email protected] "}" | ||
101 | [email protected] "\n " | 97 | [email protected] "\n " |
102 | [email protected] | 98 | [email protected] |
103 | [email protected] "fn" | 99 | [email protected] "fn" |
@@ -113,9 +109,8 @@ [email protected] | |||
113 | [email protected] ")" | 109 | [email protected] ")" |
114 | [email protected] " " | 110 | [email protected] " " |
115 | [email protected] | 111 | [email protected] |
116 | [email protected] | 112 | [email protected] "{" |
117 | [email protected] "{" | 113 | [email protected] "}" |
118 | [email protected] "}" | ||
119 | [email protected] "\n" | 114 | [email protected] "\n" |
120 | [email protected] "}" | 115 | [email protected] "}" |
121 | [email protected] "\n" | 116 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast index a8ddd20c9..10eb31d68 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast | |||
@@ -9,89 +9,88 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "foo" |
23 | [email protected] "foo" | 23 | [email protected] "::" |
24 | [email protected] "::" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "Bar" |
27 | [email protected] "Bar" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "=" |
29 | [email protected] "=" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] ";" |
34 | [email protected] ";" | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "let" |
37 | [email protected] "let" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "::" |
42 | [email protected] "::" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "Bar" |
44 | [email protected] "Bar" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "=" |
46 | [email protected] "=" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] ";" |
51 | [email protected] ";" | 51 | [email protected] "\n " |
52 | [email protected] "\n " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "let" |
54 | [email protected] "let" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "Bar" |
60 | [email protected] "Bar" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "{" |
63 | [email protected] "{" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] ".." |
65 | [email protected] ".." | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] "}" |
67 | [email protected] "}" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] "=" |
69 | [email protected] "=" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "(" |
72 | [email protected] "(" | 72 | [email protected] ")" |
73 | [email protected] ")" | 73 | [email protected] ";" |
74 | [email protected] ";" | 74 | [email protected] "\n " |
75 | [email protected] "\n " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "let" |
77 | [email protected] "let" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "Bar" |
83 | [email protected] "Bar" | 83 | [email protected] "(" |
84 | [email protected] "(" | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] ".." |
86 | [email protected] ".." | 86 | [email protected] ")" |
87 | [email protected] ")" | 87 | [email protected] " " |
88 | [email protected] " " | 88 | [email protected] "=" |
89 | [email protected] "=" | 89 | [email protected] " " |
90 | [email protected] " " | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] "(" |
92 | [email protected] "(" | 92 | [email protected] ")" |
93 | [email protected] ")" | 93 | [email protected] ";" |
94 | [email protected] ";" | 94 | [email protected] "\n" |
95 | [email protected] "\n" | 95 | [email protected] "}" |
96 | [email protected] "}" | ||
97 | [email protected] "\n" | 96 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast index df8ada62a..425e5196c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast | |||
@@ -9,18 +9,16 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "loop" |
17 | [email protected] "loop" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "{" |
20 | [email protected] | 20 | [email protected] "}" |
21 | [email protected] "{" | 21 | [email protected] ";" |
22 | [email protected] "}" | 22 | [email protected] "\n" |
23 | [email protected] ";" | 23 | [email protected] "}" |
24 | [email protected] "\n" | ||
25 | [email protected] "}" | ||
26 | [email protected] "\n" | 24 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast index de01cc79e..d823c08fc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast | |||
@@ -9,52 +9,51 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] "." |
22 | [email protected] "." | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "foo" |
24 | [email protected] "foo" | 24 | [email protected] ";" |
25 | [email protected] ";" | 25 | [email protected] "\n " |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "x" |
34 | [email protected] "x" | 34 | [email protected] "." |
35 | [email protected] "." | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "0" |
37 | [email protected] "0" | 37 | [email protected] "." |
38 | [email protected] "." | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "bar" |
40 | [email protected] "bar" | 40 | [email protected] ";" |
41 | [email protected] ";" | 41 | [email protected] "\n " |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "x" |
50 | [email protected] "x" | 50 | [email protected] "." |
51 | [email protected] "." | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "0" |
53 | [email protected] "0" | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "(" |
55 | [email protected] "(" | 55 | [email protected] ")" |
56 | [email protected] ")" | 56 | [email protected] ";" |
57 | [email protected] ";" | 57 | [email protected] "\n" |
58 | [email protected] "\n" | 58 | [email protected] "}" |
59 | [email protected] "}" | ||
60 | [email protected] "\n" | 59 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast index 8ac307cb3..422912e3c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast | |||
@@ -9,29 +9,27 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "loop" |
16 | [email protected] "loop" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "{" |
19 | [email protected] | 19 | [email protected] "\n " |
20 | [email protected] "{" | 20 | [email protected] |
21 | [email protected] "\n " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "continue" |
23 | [email protected] | 23 | [email protected] ";" |
24 | [email protected] "continue" | 24 | [email protected] "\n " |
25 | [email protected] ";" | 25 | [email protected] |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "continue" |
28 | [email protected] | 28 | [email protected] " " |
29 | [email protected] "continue" | 29 | [email protected] "\'l" |
30 | [email protected] " " | 30 | [email protected] ";" |
31 | [email protected] "\'l" | 31 | [email protected] "\n " |
32 | [email protected] ";" | 32 | [email protected] "}" |
33 | [email protected] "\n " | 33 | [email protected] "\n" |
34 | [email protected] "}" | 34 | [email protected] "}" |
35 | [email protected] "\n" | ||
36 | [email protected] "}" | ||
37 | [email protected] "\n" | 35 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast index 6f6400d00..15da6fdd6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast | |||
@@ -32,9 +32,8 @@ [email protected] | |||
32 | [email protected] ")" | 32 | [email protected] ")" |
33 | [email protected] " " | 33 | [email protected] " " |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "{" |
36 | [email protected] "{" | 36 | [email protected] "}" |
37 | [email protected] "}" | ||
38 | [email protected] "\n " | 37 | [email protected] "\n " |
39 | [email protected] | 38 | [email protected] |
40 | [email protected] "fn" | 39 | [email protected] "fn" |
@@ -66,9 +65,8 @@ [email protected] | |||
66 | [email protected] ")" | 65 | [email protected] ")" |
67 | [email protected] " " | 66 | [email protected] " " |
68 | [email protected] | 67 | [email protected] |
69 | [email protected] | 68 | [email protected] "{" |
70 | [email protected] "{" | 69 | [email protected] "}" |
71 | [email protected] "}" | ||
72 | [email protected] "\n" | 70 | [email protected] "\n" |
73 | [email protected] "}" | 71 | [email protected] "}" |
74 | [email protected] "\n" | 72 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast index ba422f1ae..10d6b2fde 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast | |||
@@ -9,37 +9,36 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "*" |
17 | [email protected] "*" | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "*" |
19 | [email protected] "*" | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "&" |
21 | [email protected] "&" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "1" |
23 | [email protected] "1" | 23 | [email protected] ";" |
24 | [email protected] ";" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "!" |
28 | [email protected] "!" | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "!" |
30 | [email protected] "!" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "true" |
32 | [email protected] "true" | 32 | [email protected] ";" |
33 | [email protected] ";" | 33 | [email protected] "\n " |
34 | [email protected] "\n " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "-" |
37 | [email protected] "-" | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "-" |
39 | [email protected] "-" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "1" |
41 | [email protected] "1" | 41 | [email protected] ";" |
42 | [email protected] ";" | 42 | [email protected] "\n" |
43 | [email protected] "\n" | 43 | [email protected] "}" |
44 | [email protected] "}" | ||
45 | [email protected] "\n" | 44 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast index de22b22dd..c204aeb63 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast | |||
@@ -55,9 +55,8 @@ [email protected] | |||
55 | [email protected] ")" | 55 | [email protected] ")" |
56 | [email protected] " " | 56 | [email protected] " " |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "{" |
59 | [email protected] "{" | 59 | [email protected] "}" |
60 | [email protected] "}" | ||
61 | [email protected] "\n " | 60 | [email protected] "\n " |
62 | [email protected] | 61 | [email protected] |
63 | [email protected] "fn" | 62 | [email protected] "fn" |
@@ -72,9 +71,8 @@ [email protected] | |||
72 | [email protected] ")" | 71 | [email protected] ")" |
73 | [email protected] " " | 72 | [email protected] " " |
74 | [email protected] | 73 | [email protected] |
75 | [email protected] | 74 | [email protected] "{" |
76 | [email protected] "{" | 75 | [email protected] "}" |
77 | [email protected] "}" | ||
78 | [email protected] "\n" | 76 | [email protected] "\n" |
79 | [email protected] "}" | 77 | [email protected] "}" |
80 | [email protected] "\n" | 78 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast index 7da292a2d..7eb27d5e1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast | |||
@@ -9,34 +9,33 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "[" |
19 | [email protected] "[" | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "a" |
22 | [email protected] "a" | 22 | [email protected] "," |
23 | [email protected] "," | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "b" |
27 | [email protected] "b" | 27 | [email protected] "," |
28 | [email protected] "," | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] ".." |
31 | [email protected] ".." | 31 | [email protected] "]" |
32 | [email protected] "]" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] "=" |
34 | [email protected] "=" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "[" |
37 | [email protected] "[" | 37 | [email protected] "]" |
38 | [email protected] "]" | 38 | [email protected] ";" |
39 | [email protected] ";" | 39 | [email protected] "\n" |
40 | [email protected] "\n" | 40 | [email protected] "}" |
41 | [email protected] "}" | ||
42 | [email protected] "\n" | 41 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast index 574942f06..b4598768e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast | |||
@@ -9,97 +9,96 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "S" |
22 | [email protected] "S" | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] ")" |
24 | [email protected] ")" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] "=" |
26 | [email protected] "=" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "(" |
29 | [email protected] "(" | 29 | [email protected] ")" |
30 | [email protected] ")" | 30 | [email protected] ";" |
31 | [email protected] ";" | 31 | [email protected] "\n " |
32 | [email protected] "\n " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "let" |
34 | [email protected] "let" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "S" |
40 | [email protected] "S" | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "_" |
43 | [email protected] "_" | 43 | [email protected] ")" |
44 | [email protected] ")" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "=" |
46 | [email protected] "=" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] ";" |
51 | [email protected] ";" | 51 | [email protected] "\n " |
52 | [email protected] "\n " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "let" |
54 | [email protected] "let" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "S" |
60 | [email protected] "S" | 60 | [email protected] "(" |
61 | [email protected] "(" | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "_" |
63 | [email protected] "_" | 63 | [email protected] "," |
64 | [email protected] "," | 64 | [email protected] ")" |
65 | [email protected] ")" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] "=" |
67 | [email protected] "=" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "(" |
70 | [email protected] "(" | 70 | [email protected] ")" |
71 | [email protected] ")" | 71 | [email protected] ";" |
72 | [email protected] ";" | 72 | [email protected] "\n " |
73 | [email protected] "\n " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "let" |
75 | [email protected] "let" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "S" |
81 | [email protected] "S" | 81 | [email protected] "(" |
82 | [email protected] "(" | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "_" |
84 | [email protected] "_" | 84 | [email protected] "," |
85 | [email protected] "," | 85 | [email protected] " " |
86 | [email protected] " " | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] ".." |
88 | [email protected] ".." | 88 | [email protected] " " |
89 | [email protected] " " | 89 | [email protected] "," |
90 | [email protected] "," | 90 | [email protected] " " |
91 | [email protected] " " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "x" |
94 | [email protected] "x" | 94 | [email protected] ")" |
95 | [email protected] ")" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] "=" |
97 | [email protected] "=" | 97 | [email protected] " " |
98 | [email protected] " " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "(" |
100 | [email protected] "(" | 100 | [email protected] ")" |
101 | [email protected] ")" | 101 | [email protected] ";" |
102 | [email protected] ";" | 102 | [email protected] "\n" |
103 | [email protected] "\n" | 103 | [email protected] "}" |
104 | [email protected] "}" | ||
105 | [email protected] "\n" | 104 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast index 1927438bb..b824c10a8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast | |||
@@ -9,42 +9,41 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "&" |
19 | [email protected] "&" | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "a" |
22 | [email protected] "a" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] "=" |
24 | [email protected] "=" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "(" |
27 | [email protected] "(" | 27 | [email protected] ")" |
28 | [email protected] ")" | 28 | [email protected] ";" |
29 | [email protected] ";" | 29 | [email protected] "\n " |
30 | [email protected] "\n " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "let" |
32 | [email protected] "let" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "&" |
35 | [email protected] "&" | 35 | [email protected] "mut" |
36 | [email protected] "mut" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "b" |
40 | [email protected] "b" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] "=" |
42 | [email protected] "=" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "(" |
45 | [email protected] "(" | 45 | [email protected] ")" |
46 | [email protected] ")" | 46 | [email protected] ";" |
47 | [email protected] ";" | 47 | [email protected] "\n" |
48 | [email protected] "\n" | 48 | [email protected] "}" |
49 | [email protected] "}" | ||
50 | [email protected] "\n" | 49 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast index 9effb345f..fabb09937 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast | |||
@@ -9,82 +9,81 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "82" |
18 | [email protected] "82" | 18 | [email protected] " " |
19 | [email protected] " " | 19 | [email protected] "as" |
20 | [email protected] "as" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "i32" |
26 | [email protected] "i32" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "81" |
33 | [email protected] "81" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] "as" |
35 | [email protected] "as" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "i8" |
41 | [email protected] "i8" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] "+" |
43 | [email protected] "+" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "1" |
46 | [email protected] "1" | 46 | [email protected] ";" |
47 | [email protected] ";" | 47 | [email protected] "\n " |
48 | [email protected] "\n " | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "79" |
53 | [email protected] "79" | 53 | [email protected] " " |
54 | [email protected] " " | 54 | [email protected] "as" |
55 | [email protected] "as" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "i16" |
61 | [email protected] "i16" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] "-" |
63 | [email protected] "-" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "1" |
66 | [email protected] "1" | 66 | [email protected] ";" |
67 | [email protected] ";" | 67 | [email protected] "\n " |
68 | [email protected] "\n " | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "0x36" |
73 | [email protected] "0x36" | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] "as" |
75 | [email protected] "as" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "u8" |
81 | [email protected] "u8" | 81 | [email protected] " " |
82 | [email protected] " " | 82 | [email protected] "<=" |
83 | [email protected] "<=" | 83 | [email protected] " " |
84 | [email protected] " " | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] "0x37" |
86 | [email protected] "0x37" | 86 | [email protected] ";" |
87 | [email protected] ";" | 87 | [email protected] "\n" |
88 | [email protected] "\n" | 88 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n" | 89 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast index b6759541e..3aed26732 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast | |||
@@ -9,39 +9,37 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "if" |
16 | [email protected] "if" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "let" |
19 | [email protected] "let" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "Some" |
25 | [email protected] "Some" | 25 | [email protected] "(" |
26 | [email protected] "(" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "_" |
28 | [email protected] "_" | 28 | [email protected] ")" |
29 | [email protected] ")" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "=" |
31 | [email protected] "=" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "None" |
37 | [email protected] "None" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "{" |
40 | [email protected] | 40 | [email protected] "}" |
41 | [email protected] "{" | 41 | [email protected] " " |
42 | [email protected] "}" | 42 | [email protected] "}" |
43 | [email protected] " " | ||
44 | [email protected] "}" | ||
45 | [email protected] "\n" | 43 | [email protected] "\n" |
46 | [email protected] | 44 | [email protected] |
47 | [email protected] "fn" | 45 | [email protected] "fn" |
@@ -53,157 +51,152 @@ [email protected] | |||
53 | [email protected] ")" | 51 | [email protected] ")" |
54 | [email protected] " " | 52 | [email protected] " " |
55 | [email protected] | 53 | [email protected] |
56 | [email protected] | 54 | [email protected] "{" |
57 | [email protected] "{" | 55 | [email protected] "\n " |
58 | [email protected] "\n " | 56 | [email protected] |
59 | [email protected] | 57 | [email protected] |
60 | [email protected] | 58 | [email protected] "if" |
61 | [email protected] "if" | 59 | [email protected] " " |
62 | [email protected] " " | 60 | [email protected] |
63 | [email protected] | 61 | [email protected] "let" |
64 | [email protected] "let" | 62 | [email protected] " " |
65 | [email protected] " " | 63 | [email protected] |
66 | [email protected] | 64 | [email protected] |
67 | [email protected] | 65 | [email protected] |
68 | [email protected] | 66 | [email protected] |
69 | [email protected] | 67 | [email protected] |
70 | [email protected] | 68 | [email protected] "Some" |
71 | [email protected] "Some" | 69 | [email protected] "(" |
72 | [email protected] "(" | 70 | [email protected] |
73 | [email protected] | 71 | [email protected] "_" |
74 | [email protected] "_" | 72 | [email protected] ")" |
75 | [email protected] ")" | 73 | [email protected] " " |
76 | [email protected] " " | 74 | [email protected] "|" |
77 | [email protected] "|" | 75 | [email protected] " " |
78 | [email protected] " " | 76 | [email protected] |
79 | [email protected] | 77 | [email protected] |
80 | [email protected] | 78 | [email protected] |
81 | [email protected] | 79 | [email protected] |
82 | [email protected] | 80 | [email protected] "Some" |
83 | [email protected] "Some" | 81 | [email protected] "(" |
84 | [email protected] "(" | 82 | [email protected] |
85 | [email protected] | 83 | [email protected] "_" |
86 | [email protected] "_" | 84 | [email protected] ")" |
87 | [email protected] ")" | 85 | [email protected] " " |
88 | [email protected] " " | 86 | [email protected] "=" |
89 | [email protected] "=" | 87 | [email protected] " " |
90 | [email protected] " " | 88 | [email protected] |
91 | [email protected] | 89 | [email protected] |
92 | [email protected] | 90 | [email protected] |
93 | [email protected] | 91 | [email protected] |
94 | [email protected] | 92 | [email protected] "None" |
95 | [email protected] "None" | 93 | [email protected] " " |
96 | [email protected] " " | 94 | [email protected] |
97 | [email protected] | 95 | [email protected] "{" |
98 | [email protected] | 96 | [email protected] "}" |
99 | [email protected] "{" | 97 | [email protected] "\n " |
100 | [email protected] "}" | 98 | [email protected] |
101 | [email protected] "\n " | 99 | [email protected] |
102 | [email protected] | 100 | [email protected] "if" |
103 | [email protected] | 101 | [email protected] " " |
104 | [email protected] "if" | 102 | [email protected] |
105 | [email protected] " " | 103 | [email protected] "let" |
106 | [email protected] | 104 | [email protected] " " |
107 | [email protected] "let" | 105 | [email protected] "|" |
108 | [email protected] " " | 106 | [email protected] " " |
109 | [email protected] "|" | 107 | [email protected] |
110 | [email protected] " " | 108 | [email protected] |
111 | [email protected] | 109 | [email protected] |
112 | [email protected] | 110 | [email protected] |
113 | [email protected] | 111 | [email protected] "Some" |
114 | [email protected] | 112 | [email protected] "(" |
115 | [email protected] "Some" | 113 | [email protected] |
116 | [email protected] "(" | 114 | [email protected] "_" |
117 | [email protected] | 115 | [email protected] ")" |
118 | [email protected] "_" | 116 | [email protected] " " |
119 | [email protected] ")" | 117 | [email protected] "=" |
120 | [email protected] " " | 118 | [email protected] " " |
121 | [email protected] "=" | 119 | [email protected] |
122 | [email protected] " " | 120 | [email protected] |
123 | [email protected] | 121 | [email protected] |
124 | [email protected] | 122 | [email protected] |
125 | [email protected] | 123 | [email protected] "None" |
126 | [email protected] | 124 | [email protected] " " |
127 | [email protected] "None" | 125 | [email protected] |
128 | [email protected] " " | 126 | [email protected] "{" |
129 | [email protected] | 127 | [email protected] "}" |
130 | [email protected] | 128 | [email protected] "\n " |
131 | [email protected] "{" | 129 | [email protected] |
132 | [email protected] "}" | 130 | [email protected] |
133 | [email protected] "\n " | 131 | [email protected] "while" |
134 | [email protected] | 132 | [email protected] " " |
135 | [email protected] | 133 | [email protected] |
136 | [email protected] "while" | 134 | [email protected] "let" |
137 | [email protected] " " | 135 | [email protected] " " |
138 | [email protected] | 136 | [email protected] |
139 | [email protected] "let" | 137 | [email protected] |
140 | [email protected] " " | 138 | [email protected] |
141 | [email protected] | 139 | [email protected] |
142 | [email protected] | 140 | [email protected] |
143 | [email protected] | 141 | [email protected] "Some" |
144 | [email protected] | 142 | [email protected] "(" |
145 | [email protected] | 143 | [email protected] |
146 | [email protected] "Some" | 144 | [email protected] "_" |
147 | [email protected] "(" | 145 | [email protected] ")" |
148 | [email protected] | 146 | [email protected] " " |
149 | [email protected] "_" | 147 | [email protected] "|" |
150 | [email protected] ")" | 148 | [email protected] " " |
151 | [email protected] " " | 149 | [email protected] |
152 | [email protected] "|" | 150 | [email protected] |
153 | [email protected] " " | 151 | [email protected] |
154 | [email protected] | 152 | [email protected] |
155 | [email protected] | 153 | [email protected] "Some" |
156 | [email protected] | 154 | [email protected] "(" |
157 | [email protected] | 155 | [email protected] |
158 | [email protected] "Some" | 156 | [email protected] "_" |
159 | [email protected] "(" | 157 | [email protected] ")" |
160 | [email protected] | 158 | [email protected] " " |
161 | [email protected] "_" | 159 | [email protected] "=" |
162 | [email protected] ")" | 160 | [email protected] " " |
163 | [email protected] " " | 161 | [email protected] |
164 | [email protected] "=" | 162 | [email protected] |
165 | [email protected] " " | 163 | [email protected] |
166 | [email protected] | 164 | [email protected] |
167 | [email protected] | 165 | [email protected] "None" |
168 | [email protected] | 166 | [email protected] " " |
169 | [email protected] | 167 | [email protected] |
170 | [email protected] "None" | 168 | [email protected] "{" |
171 | [email protected] " " | 169 | [email protected] "}" |
172 | [email protected] | 170 | [email protected] "\n " |
173 | [email protected] | 171 | [email protected] |
174 | [email protected] "{" | 172 | [email protected] "while" |
175 | [email protected] "}" | 173 | [email protected] " " |
176 | [email protected] "\n " | 174 | [email protected] |
177 | [email protected] | 175 | [email protected] "let" |
178 | [email protected] "while" | 176 | [email protected] " " |
179 | [email protected] " " | 177 | [email protected] "|" |
180 | [email protected] | 178 | [email protected] " " |
181 | [email protected] "let" | 179 | [email protected] |
182 | [email protected] " " | 180 | [email protected] |
183 | [email protected] "|" | 181 | [email protected] |
184 | [email protected] " " | 182 | [email protected] |
185 | [email protected] | 183 | [email protected] "Some" |
186 | [email protected] | 184 | [email protected] "(" |
187 | [email protected] | 185 | [email protected] |
188 | [email protected] | 186 | [email protected] "_" |
189 | [email protected] "Some" | 187 | [email protected] ")" |
190 | [email protected] "(" | 188 | [email protected] " " |
191 | [email protected] | 189 | [email protected] "=" |
192 | [email protected] "_" | 190 | [email protected] " " |
193 | [email protected] ")" | 191 | [email protected] |
194 | [email protected] " " | 192 | [email protected] |
195 | [email protected] "=" | 193 | [email protected] |
196 | [email protected] " " | 194 | [email protected] |
197 | [email protected] | 195 | [email protected] "None" |
198 | [email protected] | 196 | [email protected] " " |
199 | [email protected] | 197 | [email protected] |
200 | [email protected] | 198 | [email protected] "{" |
201 | [email protected] "None" | 199 | [email protected] "}" |
202 | [email protected] " " | 200 | [email protected] "\n" |
203 | [email protected] | 201 | [email protected] "}" |
204 | [email protected] | ||
205 | [email protected] "{" | ||
206 | [email protected] "}" | ||
207 | [email protected] "\n" | ||
208 | [email protected] "}" | ||
209 | [email protected] "\n" | 202 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast index e5138a599..899b63aac 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast | |||
@@ -9,81 +9,76 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "while" |
17 | [email protected] "while" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "true" |
21 | [email protected] "true" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] | 24 | [email protected] "}" |
25 | [email protected] "{" | 25 | [email protected] ";" |
26 | [email protected] "}" | 26 | [email protected] "\n " |
27 | [email protected] ";" | 27 | [email protected] |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "while" |
30 | [email protected] | 30 | [email protected] " " |
31 | [email protected] "while" | 31 | [email protected] |
32 | [email protected] " " | 32 | [email protected] "let" |
33 | [email protected] | 33 | [email protected] " " |
34 | [email protected] "let" | 34 | [email protected] |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "Some" |
39 | [email protected] | 39 | [email protected] "(" |
40 | [email protected] "Some" | 40 | [email protected] |
41 | [email protected] "(" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "x" |
43 | [email protected] | 43 | [email protected] ")" |
44 | [email protected] "x" | 44 | [email protected] " " |
45 | [email protected] ")" | 45 | [email protected] "=" |
46 | [email protected] " " | 46 | [email protected] " " |
47 | [email protected] "=" | 47 | [email protected] |
48 | [email protected] " " | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "it" |
53 | [email protected] | 53 | [email protected] "." |
54 | [email protected] "it" | 54 | [email protected] |
55 | [email protected] "." | 55 | [email protected] "next" |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] "next" | 57 | [email protected] "(" |
58 | [email protected] | 58 | [email protected] ")" |
59 | [email protected] "(" | 59 | [email protected] " " |
60 | [email protected] ")" | 60 | [email protected] |
61 | [email protected] " " | 61 | [email protected] "{" |
62 | [email protected] | 62 | [email protected] "}" |
63 | [email protected] | 63 | [email protected] ";" |
64 | [email protected] "{" | 64 | [email protected] "\n " |
65 | [email protected] "}" | 65 | [email protected] |
66 | [email protected] ";" | 66 | [email protected] |
67 | [email protected] "\n " | 67 | [email protected] "while" |
68 | [email protected] | 68 | [email protected] " " |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] "while" | 70 | [email protected] |
71 | [email protected] " " | 71 | [email protected] "{" |
72 | [email protected] | 72 | [email protected] " " |
73 | [email protected] | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "true" |
75 | [email protected] "{" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] "}" |
77 | [email protected] | 77 | [email protected] " " |
78 | [email protected] "true" | 78 | [email protected] |
79 | [email protected] " " | 79 | [email protected] "{" |
80 | [email protected] "}" | 80 | [email protected] "}" |
81 | [email protected] " " | 81 | [email protected] ";" |
82 | [email protected] | 82 | [email protected] "\n" |
83 | [email protected] | 83 | [email protected] "}" |
84 | [email protected] "{" | ||
85 | [email protected] "}" | ||
86 | [email protected] ";" | ||
87 | [email protected] "\n" | ||
88 | [email protected] "}" | ||
89 | [email protected] "\n" | 84 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast index 52644da8f..e064aafaf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast | |||
@@ -9,47 +9,45 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "loop" |
16 | [email protected] "loop" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "{" |
19 | [email protected] | 19 | [email protected] "\n " |
20 | [email protected] "{" | 20 | [email protected] |
21 | [email protected] "\n " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "break" |
23 | [email protected] | 23 | [email protected] ";" |
24 | [email protected] "break" | 24 | [email protected] "\n " |
25 | [email protected] ";" | 25 | [email protected] |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "break" |
28 | [email protected] | 28 | [email protected] " " |
29 | [email protected] "break" | 29 | [email protected] "\'l" |
30 | [email protected] " " | 30 | [email protected] ";" |
31 | [email protected] "\'l" | 31 | [email protected] "\n " |
32 | [email protected] ";" | 32 | [email protected] |
33 | [email protected] "\n " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "break" |
35 | [email protected] | 35 | [email protected] " " |
36 | [email protected] "break" | 36 | [email protected] |
37 | [email protected] " " | 37 | [email protected] "92" |
38 | [email protected] | 38 | [email protected] ";" |
39 | [email protected] "92" | 39 | [email protected] "\n " |
40 | [email protected] ";" | 40 | [email protected] |
41 | [email protected] "\n " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "break" |
43 | [email protected] | 43 | [email protected] " " |
44 | [email protected] "break" | 44 | [email protected] "\'l" |
45 | [email protected] " " | 45 | [email protected] " " |
46 | [email protected] "\'l" | 46 | [email protected] |
47 | [email protected] " " | 47 | [email protected] "92" |
48 | [email protected] | 48 | [email protected] ";" |
49 | [email protected] "92" | 49 | [email protected] "\n " |
50 | [email protected] ";" | 50 | [email protected] "}" |
51 | [email protected] "\n " | 51 | [email protected] "\n" |
52 | [email protected] "}" | 52 | [email protected] "}" |
53 | [email protected] "\n" | ||
54 | [email protected] "}" | ||
55 | [email protected] "\n" | 53 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast index f061c0cac..cf5825593 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast | |||
@@ -16,7 +16,6 @@ [email protected] | |||
16 | [email protected] ")" | 16 | [email protected] ")" |
17 | [email protected] " " | 17 | [email protected] " " |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "{" |
20 | [email protected] "{" | 20 | [email protected] "}" |
21 | [email protected] "}" | ||
22 | [email protected] "\n" | 21 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast index e25fc8c3e..fbd90bc0f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast | |||
@@ -42,38 +42,37 @@ [email protected] | |||
42 | [email protected] ")" | 42 | [email protected] ")" |
43 | [email protected] " " | 43 | [email protected] " " |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "{" |
46 | [email protected] "{" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "<" |
54 | [email protected] "<" | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "usize" |
59 | [email protected] "usize" | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] "as" |
61 | [email protected] "as" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "Default" |
67 | [email protected] "Default" | 67 | [email protected] ">" |
68 | [email protected] ">" | 68 | [email protected] "::" |
69 | [email protected] "::" | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "default" |
72 | [email protected] "default" | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "(" |
74 | [email protected] "(" | 74 | [email protected] ")" |
75 | [email protected] ")" | 75 | [email protected] ";" |
76 | [email protected] ";" | 76 | [email protected] " " |
77 | [email protected] " " | 77 | [email protected] "}" |
78 | [email protected] "}" | ||
79 | [email protected] "\n" | 78 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast index a1238d610..a767f145d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast | |||
@@ -9,21 +9,20 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "xs" |
21 | [email protected] "xs" | 21 | [email protected] "[" |
22 | [email protected] "[" | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] ".." |
24 | [email protected] ".." | 24 | [email protected] "]" |
25 | [email protected] "]" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] "}" |
28 | [email protected] "}" | ||
29 | [email protected] "\n" | 28 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast index 69e5fe4bc..e92ea2bf2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast | |||
@@ -32,13 +32,12 @@ [email protected] | |||
32 | [email protected] " " | 32 | [email protected] " " |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "{" |
36 | [email protected] "{" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "2" |
39 | [email protected] "2" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] "}" |
41 | [email protected] "}" | ||
42 | [email protected] "," | 41 | [email protected] "," |
43 | [email protected] " " | 42 | [email protected] " " |
44 | [email protected] | 43 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast index 1a98e2610..aa582516a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast | |||
@@ -12,10 +12,9 @@ [email protected] | |||
12 | [email protected] ")" | 12 | [email protected] ")" |
13 | [email protected] " " | 13 | [email protected] " " |
14 | [email protected] | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "{" |
16 | [email protected] "{" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] "}" |
18 | [email protected] "}" | ||
19 | [email protected] "\n" | 18 | [email protected] "\n" |
20 | [email protected] | 19 | [email protected] |
21 | [email protected] "struct" | 20 | [email protected] "struct" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast index bbf6dc494..0c1c6e877 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast | |||
@@ -9,140 +9,139 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "f" |
28 | [email protected] "f" | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "(" |
30 | [email protected] "(" | 30 | [email protected] ")" |
31 | [email protected] ")" | 31 | [email protected] ";" |
32 | [email protected] ";" | 32 | [email protected] "\n " |
33 | [email protected] "\n " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "let" |
35 | [email protected] "let" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "_" |
38 | [email protected] "_" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] "=" |
40 | [email protected] "=" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "f" |
49 | [email protected] "f" | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "(" |
51 | [email protected] "(" | 51 | [email protected] ")" |
52 | [email protected] ")" | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "(" |
54 | [email protected] "(" | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "1" |
56 | [email protected] "1" | 56 | [email protected] ")" |
57 | [email protected] ")" | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "(" |
59 | [email protected] "(" | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "1" |
61 | [email protected] "1" | 61 | [email protected] "," |
62 | [email protected] "," | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "2" |
65 | [email protected] "2" | 65 | [email protected] "," |
66 | [email protected] "," | 66 | [email protected] ")" |
67 | [email protected] ")" | 67 | [email protected] ";" |
68 | [email protected] ";" | 68 | [email protected] "\n " |
69 | [email protected] "\n " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "let" |
71 | [email protected] "let" | 71 | [email protected] " " |
72 | [email protected] " " | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "_" |
74 | [email protected] "_" | 74 | [email protected] " " |
75 | [email protected] " " | 75 | [email protected] "=" |
76 | [email protected] "=" | 76 | [email protected] " " |
77 | [email protected] " " | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "f" |
83 | [email protected] "f" | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "(" |
85 | [email protected] "(" | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "<" |
91 | [email protected] "<" | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "Foo" |
96 | [email protected] "Foo" | 96 | [email protected] ">" |
97 | [email protected] ">" | 97 | [email protected] "::" |
98 | [email protected] "::" | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] "func" |
101 | [email protected] "func" | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] "(" |
103 | [email protected] "(" | 103 | [email protected] ")" |
104 | [email protected] ")" | 104 | [email protected] ")" |
105 | [email protected] ")" | 105 | [email protected] ";" |
106 | [email protected] ";" | 106 | [email protected] "\n " |
107 | [email protected] "\n " | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] |
109 | [email protected] | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] |
113 | [email protected] | 113 | [email protected] "f" |
114 | [email protected] "f" | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] "(" |
116 | [email protected] "(" | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] "<" |
122 | [email protected] "<" | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] |
124 | [email protected] | 124 | [email protected] |
125 | [email protected] | 125 | [email protected] |
126 | [email protected] | 126 | [email protected] "Foo" |
127 | [email protected] "Foo" | 127 | [email protected] " " |
128 | [email protected] " " | 128 | [email protected] "as" |
129 | [email protected] "as" | 129 | [email protected] " " |
130 | [email protected] " " | 130 | [email protected] |
131 | [email protected] | 131 | [email protected] |
132 | [email protected] | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] |
134 | [email protected] | 134 | [email protected] "Trait" |
135 | [email protected] "Trait" | 135 | [email protected] ">" |
136 | [email protected] ">" | 136 | [email protected] "::" |
137 | [email protected] "::" | 137 | [email protected] |
138 | [email protected] | 138 | [email protected] |
139 | [email protected] | 139 | [email protected] "func" |
140 | [email protected] "func" | 140 | [email protected] |
141 | [email protected] | 141 | [email protected] "(" |
142 | [email protected] "(" | 142 | [email protected] ")" |
143 | [email protected] ")" | 143 | [email protected] ")" |
144 | [email protected] ")" | 144 | [email protected] ";" |
145 | [email protected] ";" | 145 | [email protected] "\n" |
146 | [email protected] "\n" | 146 | [email protected] "}" |
147 | [email protected] "}" | ||
148 | [email protected] "\n" | 147 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast index a454dfc3a..c23b3b67c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast | |||
@@ -9,22 +9,20 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "fn" |
16 | [email protected] "fn" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "b" |
19 | [email protected] "b" | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "(" |
21 | [email protected] "(" | 21 | [email protected] ")" |
22 | [email protected] ")" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] | 25 | [email protected] "}" |
26 | [email protected] "{" | 26 | [email protected] " " |
27 | [email protected] "}" | 27 | [email protected] "}" |
28 | [email protected] " " | ||
29 | [email protected] "}" | ||
30 | [email protected] "\n" | 28 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index 2a50f796c..9ca2165ba 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast | |||
@@ -41,7 +41,6 @@ [email protected] | |||
41 | [email protected] "(" | 41 | [email protected] "(" |
42 | [email protected] ")" | 42 | [email protected] ")" |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "{" |
45 | [email protected] "{" | 45 | [email protected] "}" |
46 | [email protected] "}" | ||
47 | [email protected] "\n" | 46 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast index 7f87e05ec..b209f67f8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast | |||
@@ -35,9 +35,8 @@ [email protected] | |||
35 | [email protected] ">" | 35 | [email protected] ">" |
36 | [email protected] " " | 36 | [email protected] " " |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "{" |
39 | [email protected] "{" | 39 | [email protected] "}" |
40 | [email protected] "}" | ||
41 | [email protected] "\n" | 40 | [email protected] "\n" |
42 | [email protected] | 41 | [email protected] |
43 | [email protected] "fn" | 42 | [email protected] "fn" |
@@ -77,7 +76,6 @@ [email protected] | |||
77 | [email protected] ">" | 76 | [email protected] ">" |
78 | [email protected] " " | 77 | [email protected] " " |
79 | [email protected] | 78 | [email protected] |
80 | [email protected] | 79 | [email protected] "{" |
81 | [email protected] "{" | 80 | [email protected] "}" |
82 | [email protected] "}" | ||
83 | [email protected] "\n" | 81 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast index 5f846177e..70232a3b2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast | |||
@@ -9,88 +9,87 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "a" |
27 | [email protected] "a" | 27 | [email protected] ";" |
28 | [email protected] ";" | 28 | [email protected] "\n " |
29 | [email protected] "\n " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "let" |
31 | [email protected] "let" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "_" |
34 | [email protected] "_" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] "=" |
36 | [email protected] "=" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "a" |
43 | [email protected] "a" | 43 | [email protected] "::" |
44 | [email protected] "::" | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "b" |
47 | [email protected] "b" | 47 | [email protected] ";" |
48 | [email protected] ";" | 48 | [email protected] "\n " |
49 | [email protected] "\n " | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "let" |
51 | [email protected] "let" | 51 | [email protected] " " |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "_" |
54 | [email protected] "_" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] "=" |
56 | [email protected] "=" | 56 | [email protected] " " |
57 | [email protected] " " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "::" |
61 | [email protected] "::" | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "a" |
63 | [email protected] "a" | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "::" |
65 | [email protected] "::" | 65 | [email protected] "<" |
66 | [email protected] "<" | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "b" |
72 | [email protected] "b" | 72 | [email protected] ">" |
73 | [email protected] ">" | 73 | [email protected] ";" |
74 | [email protected] ";" | 74 | [email protected] "\n " |
75 | [email protected] "\n " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "let" |
77 | [email protected] "let" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "_" |
80 | [email protected] "_" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "=" |
82 | [email protected] "=" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "format" |
88 | [email protected] "format" | 88 | [email protected] "!" |
89 | [email protected] "!" | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "(" |
91 | [email protected] "(" | 91 | [email protected] ")" |
92 | [email protected] ")" | 92 | [email protected] ";" |
93 | [email protected] ";" | 93 | [email protected] "\n" |
94 | [email protected] "\n" | 94 | [email protected] "}" |
95 | [email protected] "}" | ||
96 | [email protected] "\n" | 95 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast index d9310e82e..03c52525e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast | |||
@@ -9,69 +9,68 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "-" |
27 | [email protected] "-" | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "1" |
29 | [email protected] "1" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "=>" |
31 | [email protected] "=>" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "(" |
34 | [email protected] "(" | 34 | [email protected] ")" |
35 | [email protected] ")" | 35 | [email protected] "," |
36 | [email protected] "," | 36 | [email protected] "\n " |
37 | [email protected] "\n " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "92" |
41 | [email protected] "92" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] "=>" |
43 | [email protected] "=>" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "(" |
46 | [email protected] "(" | 46 | [email protected] ")" |
47 | [email protected] ")" | 47 | [email protected] "," |
48 | [email protected] "," | 48 | [email protected] "\n " |
49 | [email protected] "\n " | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "\'c\'" |
53 | [email protected] "\'c\'" | 53 | [email protected] " " |
54 | [email protected] " " | 54 | [email protected] "=>" |
55 | [email protected] "=>" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "(" |
58 | [email protected] "(" | 58 | [email protected] ")" |
59 | [email protected] ")" | 59 | [email protected] "," |
60 | [email protected] "," | 60 | [email protected] "\n " |
61 | [email protected] "\n " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "\"hello\"" |
65 | [email protected] "\"hello\"" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] "=>" |
67 | [email protected] "=>" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "(" |
70 | [email protected] "(" | 70 | [email protected] ")" |
71 | [email protected] ")" | 71 | [email protected] "," |
72 | [email protected] "," | 72 | [email protected] "\n " |
73 | [email protected] "\n " | 73 | [email protected] "}" |
74 | [email protected] "}" | 74 | [email protected] "\n" |
75 | [email protected] "\n" | 75 | [email protected] "}" |
76 | [email protected] "}" | ||
77 | [email protected] "\n" | 76 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast index 2e727c1ef..24f89b83f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast | |||
@@ -105,7 +105,6 @@ [email protected] | |||
105 | [email protected] "\'a" | 105 | [email protected] "\'a" |
106 | [email protected] "\n" | 106 | [email protected] "\n" |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "{" |
109 | [email protected] "{" | 109 | [email protected] "}" |
110 | [email protected] "}" | ||
111 | [email protected] "\n" | 110 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast index c1e58f9bf..bb43d1eaf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast | |||
@@ -11,7 +11,6 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "}" |
16 | [email protected] "}" | ||
17 | [email protected] "\n" | 16 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast index 9bdf2379f..8bd94a868 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast | |||
@@ -9,75 +9,74 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "92" |
19 | [email protected] "92" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "0" |
28 | [email protected] "0" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "..." |
30 | [email protected] "..." | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "100" |
34 | [email protected] "100" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] "=>" |
36 | [email protected] "=>" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "(" |
39 | [email protected] "(" | 39 | [email protected] ")" |
40 | [email protected] ")" | 40 | [email protected] "," |
41 | [email protected] "," | 41 | [email protected] "\n " |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "101" |
47 | [email protected] "101" | 47 | [email protected] " " |
48 | [email protected] " " | 48 | [email protected] "..=" |
49 | [email protected] "..=" | 49 | [email protected] " " |
50 | [email protected] " " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "200" |
53 | [email protected] "200" | 53 | [email protected] " " |
54 | [email protected] " " | 54 | [email protected] "=>" |
55 | [email protected] "=>" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "(" |
58 | [email protected] "(" | 58 | [email protected] ")" |
59 | [email protected] ")" | 59 | [email protected] "," |
60 | [email protected] "," | 60 | [email protected] "\n " |
61 | [email protected] "\n " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "200" |
66 | [email protected] "200" | 66 | [email protected] " " |
67 | [email protected] " " | 67 | [email protected] ".." |
68 | [email protected] ".." | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "301" |
72 | [email protected] "301" | 72 | [email protected] "=>" |
73 | [email protected] "=>" | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "(" |
76 | [email protected] "(" | 76 | [email protected] ")" |
77 | [email protected] ")" | 77 | [email protected] "," |
78 | [email protected] "," | 78 | [email protected] "\n " |
79 | [email protected] "\n " | 79 | [email protected] "}" |
80 | [email protected] "}" | 80 | [email protected] "\n" |
81 | [email protected] "\n" | 81 | [email protected] "}" |
82 | [email protected] "}" | ||
83 | [email protected] "\n" | 82 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast index e9ca92364..9210f155c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast | |||
@@ -9,52 +9,50 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "_" |
27 | [email protected] "_" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "=>" |
29 | [email protected] "=>" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] "," |
34 | [email protected] "," | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "_" |
38 | [email protected] "_" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] "=>" |
40 | [email protected] "=>" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "{" |
43 | [email protected] | 43 | [email protected] "}" |
44 | [email protected] "{" | 44 | [email protected] "\n " |
45 | [email protected] "}" | 45 | [email protected] |
46 | [email protected] "\n " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "_" |
48 | [email protected] | 48 | [email protected] " " |
49 | [email protected] "_" | 49 | [email protected] "=>" |
50 | [email protected] " " | 50 | [email protected] " " |
51 | [email protected] "=>" | 51 | [email protected] |
52 | [email protected] " " | 52 | [email protected] "(" |
53 | [email protected] | 53 | [email protected] ")" |
54 | [email protected] "(" | 54 | [email protected] "\n " |
55 | [email protected] ")" | 55 | [email protected] "}" |
56 | [email protected] "\n " | 56 | [email protected] "\n" |
57 | [email protected] "}" | 57 | [email protected] "}" |
58 | [email protected] "\n" | ||
59 | [email protected] "}" | ||
60 | [email protected] "\n" | 58 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast index 15d332938..850465d82 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast | |||
@@ -9,117 +9,116 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "S" |
20 | [email protected] "S" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "}" |
24 | [email protected] "}" | 24 | [email protected] ";" |
25 | [email protected] ";" | 25 | [email protected] "\n " |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "S" |
32 | [email protected] "S" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "{" |
35 | [email protected] "{" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "x" |
42 | [email protected] "x" | 42 | [email protected] "," |
43 | [email protected] "," | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "y" |
47 | [email protected] "y" | 47 | [email protected] ":" |
48 | [email protected] ":" | 48 | [email protected] " " |
49 | [email protected] " " | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "32" |
51 | [email protected] "32" | 51 | [email protected] "," |
52 | [email protected] "," | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] "}" |
54 | [email protected] "}" | 54 | [email protected] ";" |
55 | [email protected] ";" | 55 | [email protected] "\n " |
56 | [email protected] "\n " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "S" |
62 | [email protected] "S" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "{" |
65 | [email protected] "{" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "x" |
72 | [email protected] "x" | 72 | [email protected] "," |
73 | [email protected] "," | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "y" |
77 | [email protected] "y" | 77 | [email protected] ":" |
78 | [email protected] ":" | 78 | [email protected] " " |
79 | [email protected] " " | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "32" |
81 | [email protected] "32" | 81 | [email protected] "," |
82 | [email protected] "," | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] ".." |
84 | [email protected] ".." | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "Default" |
91 | [email protected] "Default" | 91 | [email protected] "::" |
92 | [email protected] "::" | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] "default" |
95 | [email protected] "default" | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] "(" |
97 | [email protected] "(" | 97 | [email protected] ")" |
98 | [email protected] ")" | 98 | [email protected] " " |
99 | [email protected] " " | 99 | [email protected] "}" |
100 | [email protected] "}" | 100 | [email protected] ";" |
101 | [email protected] ";" | 101 | [email protected] "\n " |
102 | [email protected] "\n " | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] "TupleStruct" |
108 | [email protected] "TupleStruct" | 108 | [email protected] " " |
109 | [email protected] " " | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] "{" |
111 | [email protected] "{" | 111 | [email protected] " " |
112 | [email protected] " " | 112 | [email protected] |
113 | [email protected] | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] "0" |
115 | [email protected] "0" | 115 | [email protected] ":" |
116 | [email protected] ":" | 116 | [email protected] " " |
117 | [email protected] " " | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] "1" |
119 | [email protected] "1" | 119 | [email protected] " " |
120 | [email protected] " " | 120 | [email protected] "}" |
121 | [email protected] "}" | 121 | [email protected] ";" |
122 | [email protected] ";" | 122 | [email protected] "\n" |
123 | [email protected] "\n" | 123 | [email protected] "}" |
124 | [email protected] "}" | ||
125 | [email protected] "\n" | 124 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast index 3cce106e4..02656df31 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast | |||
@@ -9,9 +9,8 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "}" |
14 | [email protected] "}" | ||
15 | [email protected] "\n" | 14 | [email protected] "\n" |
16 | [email protected] | 15 | [email protected] |
17 | [email protected] | 16 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast index 5e1b4cc68..445d8d309 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast | |||
@@ -9,124 +9,113 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "if" |
17 | [email protected] "if" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "true" |
21 | [email protected] "true" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] | 24 | [email protected] "}" |
25 | [email protected] "{" | 25 | [email protected] ";" |
26 | [email protected] "}" | 26 | [email protected] "\n " |
27 | [email protected] ";" | 27 | [email protected] |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "if" |
30 | [email protected] | 30 | [email protected] " " |
31 | [email protected] "if" | 31 | [email protected] |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "true" |
34 | [email protected] | 34 | [email protected] " " |
35 | [email protected] "true" | 35 | [email protected] |
36 | [email protected] " " | 36 | [email protected] "{" |
37 | [email protected] | 37 | [email protected] "}" |
38 | [email protected] | 38 | [email protected] " " |
39 | [email protected] "{" | 39 | [email protected] "else" |
40 | [email protected] "}" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] "else" | 42 | [email protected] "{" |
43 | [email protected] " " | 43 | [email protected] "}" |
44 | [email protected] | 44 | [email protected] ";" |
45 | [email protected] | 45 | [email protected] "\n " |
46 | [email protected] "{" | 46 | [email protected] |
47 | [email protected] "}" | 47 | [email protected] |
48 | [email protected] ";" | 48 | [email protected] "if" |
49 | [email protected] "\n " | 49 | [email protected] " " |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] "if" | 52 | [email protected] "true" |
53 | [email protected] " " | 53 | [email protected] " " |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "{" |
56 | [email protected] "true" | 56 | [email protected] "}" |
57 | [email protected] " " | 57 | [email protected] " " |
58 | [email protected] | 58 | [email protected] "else" |
59 | [email protected] | 59 | [email protected] " " |
60 | [email protected] "{" | 60 | [email protected] |
61 | [email protected] "}" | 61 | [email protected] "if" |
62 | [email protected] " " | 62 | [email protected] " " |
63 | [email protected] "else" | 63 | [email protected] |
64 | [email protected] " " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "false" |
66 | [email protected] "if" | 66 | [email protected] " " |
67 | [email protected] " " | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] "{" |
69 | [email protected] | 69 | [email protected] "}" |
70 | [email protected] "false" | 70 | [email protected] " " |
71 | [email protected] " " | 71 | [email protected] "else" |
72 | [email protected] | 72 | [email protected] " " |
73 | [email protected] | 73 | [email protected] |
74 | [email protected] "{" | 74 | [email protected] "{" |
75 | [email protected] "}" | 75 | [email protected] "}" |
76 | [email protected] " " | 76 | [email protected] ";" |
77 | [email protected] "else" | 77 | [email protected] "\n " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "if" |
81 | [email protected] "{" | 81 | [email protected] " " |
82 | [email protected] "}" | 82 | [email protected] |
83 | [email protected] ";" | 83 | [email protected] |
84 | [email protected] "\n " | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] "if" | 87 | [email protected] "S" |
88 | [email protected] " " | 88 | [email protected] " " |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "{" |
91 | [email protected] | 91 | [email protected] "}" |
92 | [email protected] | 92 | [email protected] ";" |
93 | [email protected] | 93 | [email protected] "\n " |
94 | [email protected] "S" | 94 | [email protected] |
95 | [email protected] " " | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] "if" |
97 | [email protected] | 97 | [email protected] " " |
98 | [email protected] "{" | 98 | [email protected] |
99 | [email protected] "}" | 99 | [email protected] |
100 | [email protected] ";" | 100 | [email protected] "{" |
101 | [email protected] "\n " | 101 | [email protected] " " |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] "true" |
104 | [email protected] "if" | 104 | [email protected] " " |
105 | [email protected] " " | 105 | [email protected] "}" |
106 | [email protected] | 106 | [email protected] " " |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "{" |
109 | [email protected] "{" | 109 | [email protected] " " |
110 | [email protected] " " | 110 | [email protected] "}" |
111 | [email protected] | 111 | [email protected] " " |
112 | [email protected] "true" | 112 | [email protected] "else" |
113 | [email protected] " " | 113 | [email protected] " " |
114 | [email protected] "}" | 114 | [email protected] |
115 | [email protected] " " | 115 | [email protected] "{" |
116 | [email protected] | 116 | [email protected] " " |
117 | [email protected] | 117 | [email protected] "}" |
118 | [email protected] "{" | 118 | [email protected] ";" |
119 | [email protected] " " | 119 | [email protected] "\n" |
120 | [email protected] "}" | 120 | [email protected] "}" |
121 | [email protected] " " | ||
122 | [email protected] "else" | ||
123 | [email protected] " " | ||
124 | [email protected] | ||
125 | [email protected] | ||
126 | [email protected] "{" | ||
127 | [email protected] " " | ||
128 | [email protected] "}" | ||
129 | [email protected] ";" | ||
130 | [email protected] "\n" | ||
131 | [email protected] "}" | ||
132 | [email protected] "\n" | 121 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast index 108e5c5cc..177bb5514 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast | |||
@@ -9,144 +9,143 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "match" |
17 | [email protected] "match" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "(" |
20 | [email protected] "(" | 20 | [email protected] ")" |
21 | [email protected] ")" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "_" |
28 | [email protected] "_" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "=>" |
30 | [email protected] "=>" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "(" |
33 | [email protected] "(" | 33 | [email protected] ")" |
34 | [email protected] ")" | 34 | [email protected] "," |
35 | [email protected] "," | 35 | [email protected] "\n " |
36 | [email protected] "\n " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "_" |
39 | [email protected] "_" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "if" |
42 | [email protected] "if" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "Test" |
49 | [email protected] "Test" | 49 | [email protected] " " |
50 | [email protected] " " | 50 | [email protected] ">" |
51 | [email protected] ">" | 51 | [email protected] " " |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "Test" |
57 | [email protected] "Test" | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "{" |
59 | [email protected] "{" | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "field" |
62 | [email protected] "field" | 62 | [email protected] ":" |
63 | [email protected] ":" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "0" |
66 | [email protected] "0" | 66 | [email protected] "}" |
67 | [email protected] "}" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] "=>" |
69 | [email protected] "=>" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "(" |
72 | [email protected] "(" | 72 | [email protected] ")" |
73 | [email protected] ")" | 73 | [email protected] "," |
74 | [email protected] "," | 74 | [email protected] "\n " |
75 | [email protected] "\n " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "X" |
80 | [email protected] "X" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "|" |
82 | [email protected] "|" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] "Y" |
86 | [email protected] "Y" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "if" |
89 | [email protected] "if" | 89 | [email protected] " " |
90 | [email protected] " " | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] "Z" |
95 | [email protected] "Z" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] "=>" |
97 | [email protected] "=>" | 97 | [email protected] " " |
98 | [email protected] " " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "(" |
100 | [email protected] "(" | 100 | [email protected] ")" |
101 | [email protected] ")" | 101 | [email protected] "," |
102 | [email protected] "," | 102 | [email protected] "\n " |
103 | [email protected] "\n " | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "|" |
105 | [email protected] "|" | 105 | [email protected] " " |
106 | [email protected] " " | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] |
109 | [email protected] | 109 | [email protected] "X" |
110 | [email protected] "X" | 110 | [email protected] " " |
111 | [email protected] " " | 111 | [email protected] "|" |
112 | [email protected] "|" | 112 | [email protected] " " |
113 | [email protected] " " | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] "Y" |
116 | [email protected] "Y" | 116 | [email protected] " " |
117 | [email protected] " " | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] "if" |
119 | [email protected] "if" | 119 | [email protected] " " |
120 | [email protected] " " | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] |
122 | [email protected] | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] |
124 | [email protected] | 124 | [email protected] "Z" |
125 | [email protected] "Z" | 125 | [email protected] " " |
126 | [email protected] " " | 126 | [email protected] "=>" |
127 | [email protected] "=>" | 127 | [email protected] " " |
128 | [email protected] " " | 128 | [email protected] |
129 | [email protected] | 129 | [email protected] "(" |
130 | [email protected] "(" | 130 | [email protected] ")" |
131 | [email protected] ")" | 131 | [email protected] "," |
132 | [email protected] "," | 132 | [email protected] "\n " |
133 | [email protected] "\n " | 133 | [email protected] |
134 | [email protected] | 134 | [email protected] "|" |
135 | [email protected] "|" | 135 | [email protected] " " |
136 | [email protected] " " | 136 | [email protected] |
137 | [email protected] | 137 | [email protected] |
138 | [email protected] | 138 | [email protected] "X" |
139 | [email protected] "X" | 139 | [email protected] " " |
140 | [email protected] " " | 140 | [email protected] "=>" |
141 | [email protected] "=>" | 141 | [email protected] " " |
142 | [email protected] " " | 142 | [email protected] |
143 | [email protected] | 143 | [email protected] "(" |
144 | [email protected] "(" | 144 | [email protected] ")" |
145 | [email protected] ")" | 145 | [email protected] "," |
146 | [email protected] "," | 146 | [email protected] "\n " |
147 | [email protected] "\n " | 147 | [email protected] "}" |
148 | [email protected] "}" | 148 | [email protected] ";" |
149 | [email protected] ";" | 149 | [email protected] "\n" |
150 | [email protected] "\n" | 150 | [email protected] "}" |
151 | [email protected] "}" | ||
152 | [email protected] "\n" | 151 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast index 1e888063e..f8ff7079b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast | |||
@@ -9,45 +9,42 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] "{" | 26 | [email protected] "1" |
27 | [email protected] | 27 | [email protected] "}" |
28 | [email protected] "1" | 28 | [email protected] " " |
29 | [email protected] "}" | 29 | [email protected] "&" |
30 | [email protected] " " | 30 | [email protected] " " |
31 | [email protected] "&" | 31 | [email protected] |
32 | [email protected] " " | 32 | [email protected] "2" |
33 | [email protected] | 33 | [email protected] ";" |
34 | [email protected] "2" | 34 | [email protected] "\n " |
35 | [email protected] ";" | 35 | [email protected] |
36 | [email protected] "\n " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "{" |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "1" |
40 | [email protected] "{" | 40 | [email protected] "}" |
41 | [email protected] | 41 | [email protected] " " |
42 | [email protected] "1" | 42 | [email protected] |
43 | [email protected] "}" | 43 | [email protected] |
44 | [email protected] " " | 44 | [email protected] "&" |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "2" |
47 | [email protected] "&" | 47 | [email protected] ";" |
48 | [email protected] | 48 | [email protected] "\n" |
49 | [email protected] "2" | 49 | [email protected] "}" |
50 | [email protected] ";" | ||
51 | [email protected] "\n" | ||
52 | [email protected] "}" | ||
53 | [email protected] "\n" | 50 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast index 218b3ec9e..07b3d1435 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast | |||
@@ -9,88 +9,85 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "match" |
17 | [email protected] "match" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "(" |
20 | [email protected] "(" | 20 | [email protected] ")" |
21 | [email protected] ")" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] "}" |
26 | [email protected] "}" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "match" |
31 | [email protected] "match" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "S" |
37 | [email protected] "S" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "{" |
40 | [email protected] "{" | 40 | [email protected] "}" |
41 | [email protected] "}" | 41 | [email protected] ";" |
42 | [email protected] ";" | 42 | [email protected] "\n " |
43 | [email protected] "\n " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "match" |
46 | [email protected] "match" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "{" |
49 | [email protected] | 49 | [email protected] " " |
50 | [email protected] "{" | 50 | [email protected] "}" |
51 | [email protected] " " | 51 | [email protected] " " |
52 | [email protected] "}" | 52 | [email protected] |
53 | [email protected] " " | 53 | [email protected] "{" |
54 | [email protected] | 54 | [email protected] " " |
55 | [email protected] "{" | 55 | [email protected] |
56 | [email protected] " " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "_" |
58 | [email protected] | 58 | [email protected] " " |
59 | [email protected] "_" | 59 | [email protected] "=>" |
60 | [email protected] " " | 60 | [email protected] " " |
61 | [email protected] "=>" | 61 | [email protected] |
62 | [email protected] " " | 62 | [email protected] "(" |
63 | [email protected] | 63 | [email protected] ")" |
64 | [email protected] "(" | 64 | [email protected] " " |
65 | [email protected] ")" | 65 | [email protected] "}" |
66 | [email protected] " " | 66 | [email protected] ";" |
67 | [email protected] "}" | 67 | [email protected] "\n " |
68 | [email protected] ";" | 68 | [email protected] |
69 | [email protected] "\n " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "match" |
71 | [email protected] | 71 | [email protected] " " |
72 | [email protected] "match" | 72 | [email protected] |
73 | [email protected] " " | 73 | [email protected] "{" |
74 | [email protected] | 74 | [email protected] " " |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] "{" | 76 | [email protected] |
77 | [email protected] " " | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "S" |
80 | [email protected] | 80 | [email protected] " " |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] "S" | 82 | [email protected] "{" |
83 | [email protected] " " | 83 | [email protected] "}" |
84 | [email protected] | 84 | [email protected] " " |
85 | [email protected] "{" | 85 | [email protected] "}" |
86 | [email protected] "}" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] "}" | 88 | [email protected] "{" |
89 | [email protected] " " | 89 | [email protected] "}" |
90 | [email protected] | 90 | [email protected] ";" |
91 | [email protected] "{" | 91 | [email protected] "\n" |
92 | [email protected] "}" | 92 | [email protected] "}" |
93 | [email protected] ";" | ||
94 | [email protected] "\n" | ||
95 | [email protected] "}" | ||
96 | [email protected] "\n" | 93 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast index b8171dc9c..665f716a8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast | |||
@@ -9,21 +9,20 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "return" |
17 | [email protected] "return" | 17 | [email protected] ";" |
18 | [email protected] ";" | 18 | [email protected] "\n " |
19 | [email protected] "\n " | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "return" |
22 | [email protected] "return" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "92" |
25 | [email protected] "92" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] "\n" |
27 | [email protected] "\n" | 27 | [email protected] "}" |
28 | [email protected] "}" | ||
29 | [email protected] "\n" | 28 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast index c2a73ef25..3fd3a4391 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast | |||
@@ -9,55 +9,51 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "_" |
27 | [email protected] "_" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "=>" |
29 | [email protected] "=>" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "{" |
32 | [email protected] | 32 | [email protected] "}" |
33 | [email protected] "{" | 33 | [email protected] "\n " |
34 | [email protected] "}" | 34 | [email protected] |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "(" |
37 | [email protected] | 37 | [email protected] ")" |
38 | [email protected] "(" | 38 | [email protected] " " |
39 | [email protected] ")" | 39 | [email protected] "=>" |
40 | [email protected] " " | 40 | [email protected] " " |
41 | [email protected] "=>" | 41 | [email protected] |
42 | [email protected] " " | 42 | [email protected] "{" |
43 | [email protected] | 43 | [email protected] "}" |
44 | [email protected] | 44 | [email protected] "\n " |
45 | [email protected] "{" | 45 | [email protected] |
46 | [email protected] "}" | 46 | [email protected] |
47 | [email protected] "\n " | 47 | [email protected] "[" |
48 | [email protected] | 48 | [email protected] "]" |
49 | [email protected] | 49 | [email protected] " " |
50 | [email protected] "[" | 50 | [email protected] "=>" |
51 | [email protected] "]" | 51 | [email protected] " " |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] "=>" | 53 | [email protected] "{" |
54 | [email protected] " " | 54 | [email protected] "}" |
55 | [email protected] | 55 | [email protected] "\n " |
56 | [email protected] | 56 | [email protected] "}" |
57 | [email protected] "{" | 57 | [email protected] "\n" |
58 | [email protected] "}" | 58 | [email protected] "}" |
59 | [email protected] "\n " | ||
60 | [email protected] "}" | ||
61 | [email protected] "\n" | ||
62 | [email protected] "}" | ||
63 | [email protected] "\n" | 59 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast index 39a86d002..97c6e6a9d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast | |||
@@ -9,9 +9,8 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "}" |
14 | [email protected] "}" | ||
15 | [email protected] "\n" | 14 | [email protected] "\n" |
16 | [email protected] | 15 | [email protected] |
17 | [email protected] "fn" | 16 | [email protected] "fn" |
@@ -23,22 +22,21 @@ [email protected] | |||
23 | [email protected] ")" | 22 | [email protected] ")" |
24 | [email protected] " " | 23 | [email protected] " " |
25 | [email protected] | 24 | [email protected] |
26 | [email protected] | 25 | [email protected] "{" |
27 | [email protected] "{" | 26 | [email protected] " " |
28 | [email protected] " " | 27 | [email protected] |
29 | [email protected] | 28 | [email protected] "let" |
30 | [email protected] "let" | 29 | [email protected] " " |
31 | [email protected] " " | 30 | [email protected] |
32 | [email protected] | 31 | [email protected] "_" |
33 | [email protected] "_" | 32 | [email protected] " " |
34 | [email protected] " " | 33 | [email protected] "=" |
35 | [email protected] "=" | 34 | [email protected] " " |
36 | [email protected] " " | 35 | [email protected] |
37 | [email protected] | 36 | [email protected] "1" |
38 | [email protected] "1" | 37 | [email protected] ";" |
39 | [email protected] ";" | 38 | [email protected] " " |
40 | [email protected] " " | 39 | [email protected] "}" |
41 | [email protected] "}" | ||
42 | [email protected] "\n" | 40 | [email protected] "\n" |
43 | [email protected] | 41 | [email protected] |
44 | [email protected] "fn" | 42 | [email protected] "fn" |
@@ -50,20 +48,19 @@ [email protected] | |||
50 | [email protected] ")" | 48 | [email protected] ")" |
51 | [email protected] " " | 49 | [email protected] " " |
52 | [email protected] | 50 | [email protected] |
53 | [email protected] | 51 | [email protected] "{" |
54 | [email protected] "{" | 52 | [email protected] " " |
55 | [email protected] " " | 53 | [email protected] |
56 | [email protected] | 54 | [email protected] |
57 | [email protected] | 55 | [email protected] "1" |
58 | [email protected] "1" | 56 | [email protected] ";" |
59 | [email protected] ";" | 57 | [email protected] " " |
60 | [email protected] " " | 58 | [email protected] |
61 | [email protected] | 59 | [email protected] |
62 | [email protected] | 60 | [email protected] "2" |
63 | [email protected] "2" | 61 | [email protected] ";" |
64 | [email protected] ";" | 62 | [email protected] " " |
65 | [email protected] " " | 63 | [email protected] "}" |
66 | [email protected] "}" | ||
67 | [email protected] "\n" | 64 | [email protected] "\n" |
68 | [email protected] | 65 | [email protected] |
69 | [email protected] "fn" | 66 | [email protected] "fn" |
@@ -75,16 +72,15 @@ [email protected] | |||
75 | [email protected] ")" | 72 | [email protected] ")" |
76 | [email protected] " " | 73 | [email protected] " " |
77 | [email protected] | 74 | [email protected] |
78 | [email protected] | 75 | [email protected] "{" |
79 | [email protected] "{" | 76 | [email protected] " " |
80 | [email protected] " " | 77 | [email protected] |
81 | [email protected] | 78 | [email protected] |
82 | [email protected] | 79 | [email protected] "1" |
83 | [email protected] "1" | 80 | [email protected] ";" |
84 | [email protected] ";" | 81 | [email protected] " " |
85 | [email protected] " " | 82 | [email protected] |
86 | [email protected] | 83 | [email protected] "2" |
87 | [email protected] "2" | 84 | [email protected] " " |
88 | [email protected] " " | 85 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n" | 86 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast index 9621ba59e..e2c1a507d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast | |||
@@ -34,7 +34,6 @@ [email protected] | |||
34 | [email protected] "Copy" | 34 | [email protected] "Copy" |
35 | [email protected] " " | 35 | [email protected] " " |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "{" |
38 | [email protected] "{" | 38 | [email protected] "}" |
39 | [email protected] "}" | ||
40 | [email protected] "\n" | 39 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast index ed9d62c5f..4f3a8ed24 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast | |||
@@ -9,18 +9,17 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] "?" |
22 | [email protected] "?" | 22 | [email protected] ";" |
23 | [email protected] ";" | 23 | [email protected] "\n" |
24 | [email protected] "\n" | 24 | [email protected] "}" |
25 | [email protected] "}" | ||
26 | [email protected] "\n" | 25 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast index 5141ce70d..462d1a8bb 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast | |||
@@ -9,88 +9,87 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "x" |
20 | [email protected] "x" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "1" |
26 | [email protected] "1" | 26 | [email protected] ".." |
27 | [email protected] ".." | 27 | [email protected] ";" |
28 | [email protected] ";" | 28 | [email protected] "\n " |
29 | [email protected] "\n " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "match" |
32 | [email protected] "match" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "1" |
36 | [email protected] "1" | 36 | [email protected] ".." |
37 | [email protected] ".." | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "{" |
40 | [email protected] "{" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "_" |
44 | [email protected] "_" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "=>" |
46 | [email protected] "=>" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] "}" |
52 | [email protected] "}" | 52 | [email protected] ";" |
53 | [email protected] ";" | 53 | [email protected] "\n " |
54 | [email protected] "\n " | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "match" |
57 | [email protected] "match" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "a" |
65 | [email protected] "a" | 65 | [email protected] "." |
66 | [email protected] "." | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] "b" |
68 | [email protected] "b" | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "(" |
70 | [email protected] "(" | 70 | [email protected] ")" |
71 | [email protected] ")" | 71 | [email protected] ".." |
72 | [email protected] ".." | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "S" |
77 | [email protected] "S" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "{" |
80 | [email protected] "{" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "_" |
84 | [email protected] "_" | 84 | [email protected] " " |
85 | [email protected] " " | 85 | [email protected] "=>" |
86 | [email protected] "=>" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "(" |
89 | [email protected] "(" | 89 | [email protected] ")" |
90 | [email protected] ")" | 90 | [email protected] " " |
91 | [email protected] " " | 91 | [email protected] "}" |
92 | [email protected] "}" | 92 | [email protected] ";" |
93 | [email protected] ";" | 93 | [email protected] "\n" |
94 | [email protected] "\n" | 94 | [email protected] "}" |
95 | [email protected] "}" | ||
96 | [email protected] "\n" | 95 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast index cdbe64180..dfb8d57ad 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | |||
@@ -89,9 +89,8 @@ [email protected] | |||
89 | [email protected] "Iterator" | 89 | [email protected] "Iterator" |
90 | [email protected] " " | 90 | [email protected] " " |
91 | [email protected] | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "{" |
93 | [email protected] "{" | 93 | [email protected] "}" |
94 | [email protected] "}" | ||
95 | [email protected] "\n" | 94 | [email protected] "\n" |
96 | [email protected] | 95 | [email protected] |
97 | [email protected] "fn" | 96 | [email protected] "fn" |
@@ -155,9 +154,8 @@ [email protected] | |||
155 | [email protected] "Iterator" | 154 | [email protected] "Iterator" |
156 | [email protected] " " | 155 | [email protected] " " |
157 | [email protected] | 156 | [email protected] |
158 | [email protected] | 157 | [email protected] "{" |
159 | [email protected] "{" | 158 | [email protected] "}" |
160 | [email protected] "}" | ||
161 | [email protected] "\n" | 159 | [email protected] "\n" |
162 | [email protected] | 160 | [email protected] |
163 | [email protected] "fn" | 161 | [email protected] "fn" |
@@ -237,7 +235,6 @@ [email protected] | |||
237 | [email protected] "Iterator" | 235 | [email protected] "Iterator" |
238 | [email protected] " " | 236 | [email protected] " " |
239 | [email protected] | 237 | [email protected] |
240 | [email protected] | 238 | [email protected] "{" |
241 | [email protected] "{" | 239 | [email protected] "}" |
242 | [email protected] "}" | ||
243 | [email protected] "\n" | 240 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast index fbad33389..7fe96e17d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast | |||
@@ -9,47 +9,46 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "&" |
24 | [email protected] "&" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "1" |
26 | [email protected] "1" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "let" |
30 | [email protected] "let" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "_" |
33 | [email protected] "_" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] "=" |
35 | [email protected] "=" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "&" |
38 | [email protected] "&" | 38 | [email protected] "mut" |
39 | [email protected] "mut" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "&" |
42 | [email protected] "&" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "f" |
48 | [email protected] "f" | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "(" |
50 | [email protected] "(" | 50 | [email protected] ")" |
51 | [email protected] ")" | 51 | [email protected] ";" |
52 | [email protected] ";" | 52 | [email protected] "\n" |
53 | [email protected] "\n" | 53 | [email protected] "}" |
54 | [email protected] "}" | ||
55 | [email protected] "\n" | 54 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast index b165789fd..9fcb7899e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast | |||
@@ -9,128 +9,127 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "true" |
24 | [email protected] "true" | 24 | [email protected] ";" |
25 | [email protected] ";" | 25 | [email protected] "\n " |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "let" |
28 | [email protected] "let" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "_" |
31 | [email protected] "_" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] "=" |
33 | [email protected] "=" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "false" |
36 | [email protected] "false" | 36 | [email protected] ";" |
37 | [email protected] ";" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "let" |
40 | [email protected] "let" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "_" |
43 | [email protected] "_" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "=" |
45 | [email protected] "=" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "1" |
48 | [email protected] "1" | 48 | [email protected] ";" |
49 | [email protected] ";" | 49 | [email protected] "\n " |
50 | [email protected] "\n " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "let" |
52 | [email protected] "let" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "_" |
55 | [email protected] "_" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] "=" |
57 | [email protected] "=" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "2.0" |
60 | [email protected] "2.0" | 60 | [email protected] ";" |
61 | [email protected] ";" | 61 | [email protected] "\n " |
62 | [email protected] "\n " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "let" |
64 | [email protected] "let" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "_" |
67 | [email protected] "_" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] "=" |
69 | [email protected] "=" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "b\'a\'" |
72 | [email protected] "b\'a\'" | 72 | [email protected] ";" |
73 | [email protected] ";" | 73 | [email protected] "\n " |
74 | [email protected] "\n " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "let" |
76 | [email protected] "let" | 76 | [email protected] " " |
77 | [email protected] " " | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] "_" |
79 | [email protected] "_" | 79 | [email protected] " " |
80 | [email protected] " " | 80 | [email protected] "=" |
81 | [email protected] "=" | 81 | [email protected] " " |
82 | [email protected] " " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "\'b\'" |
84 | [email protected] "\'b\'" | 84 | [email protected] ";" |
85 | [email protected] ";" | 85 | [email protected] "\n " |
86 | [email protected] "\n " | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "let" |
88 | [email protected] "let" | 88 | [email protected] " " |
89 | [email protected] " " | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "_" |
91 | [email protected] "_" | 91 | [email protected] " " |
92 | [email protected] " " | 92 | [email protected] "=" |
93 | [email protected] "=" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "\"c\"" |
96 | [email protected] "\"c\"" | 96 | [email protected] ";" |
97 | [email protected] ";" | 97 | [email protected] "\n " |
98 | [email protected] "\n " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "let" |
100 | [email protected] "let" | 100 | [email protected] " " |
101 | [email protected] " " | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] "_" |
103 | [email protected] "_" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] "=" |
105 | [email protected] "=" | 105 | [email protected] " " |
106 | [email protected] " " | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] "r\"d\"" |
108 | [email protected] "r\"d\"" | 108 | [email protected] ";" |
109 | [email protected] ";" | 109 | [email protected] "\n " |
110 | [email protected] "\n " | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] "let" |
112 | [email protected] "let" | 112 | [email protected] " " |
113 | [email protected] " " | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] "_" |
115 | [email protected] "_" | 115 | [email protected] " " |
116 | [email protected] " " | 116 | [email protected] "=" |
117 | [email protected] "=" | 117 | [email protected] " " |
118 | [email protected] " " | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] "b\"e\"" |
120 | [email protected] "b\"e\"" | 120 | [email protected] ";" |
121 | [email protected] ";" | 121 | [email protected] "\n " |
122 | [email protected] "\n " | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] "let" |
124 | [email protected] "let" | 124 | [email protected] " " |
125 | [email protected] " " | 125 | [email protected] |
126 | [email protected] | 126 | [email protected] "_" |
127 | [email protected] "_" | 127 | [email protected] " " |
128 | [email protected] " " | 128 | [email protected] "=" |
129 | [email protected] "=" | 129 | [email protected] " " |
130 | [email protected] " " | 130 | [email protected] |
131 | [email protected] | 131 | [email protected] "br\"f\"" |
132 | [email protected] "br\"f\"" | 132 | [email protected] ";" |
133 | [email protected] ";" | 133 | [email protected] "\n" |
134 | [email protected] "\n" | 134 | [email protected] "}" |
135 | [email protected] "}" | ||
136 | [email protected] "\n" | 135 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast index 36f17133d..a42abc189 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast | |||
@@ -9,9 +9,8 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "}" |
14 | [email protected] "}" | ||
15 | [email protected] "\n" | 14 | [email protected] "\n" |
16 | [email protected] | 15 | [email protected] |
17 | [email protected] "fn" | 16 | [email protected] "fn" |
@@ -30,7 +29,6 @@ [email protected] | |||
30 | [email protected] ")" | 29 | [email protected] ")" |
31 | [email protected] " " | 30 | [email protected] " " |
32 | [email protected] | 31 | [email protected] |
33 | [email protected] | 32 | [email protected] "{" |
34 | [email protected] "{" | 33 | [email protected] "}" |
35 | [email protected] "}" | ||
36 | [email protected] "\n" | 34 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast index ca5aa007e..7e71d7373 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast | |||
@@ -8,62 +8,58 @@ [email protected] | |||
8 | [email protected] "(" | 8 | [email protected] "(" |
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] | 10 | [email protected] |
11 | [email protected] | 11 | [email protected] "{" |
12 | [email protected] "{" | 12 | [email protected] "\n " |
13 | [email protected] "\n " | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "if" |
16 | [email protected] "if" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "break" |
20 | [email protected] "break" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] | 23 | [email protected] "}" |
24 | [email protected] "{" | 24 | [email protected] "\n " |
25 | [email protected] "}" | 25 | [email protected] |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "while" |
28 | [email protected] | 28 | [email protected] " " |
29 | [email protected] "while" | 29 | [email protected] |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "break" |
32 | [email protected] | 32 | [email protected] " " |
33 | [email protected] "break" | 33 | [email protected] |
34 | [email protected] " " | 34 | [email protected] "{" |
35 | [email protected] | 35 | [email protected] "}" |
36 | [email protected] | 36 | [email protected] "\n " |
37 | [email protected] "{" | 37 | [email protected] |
38 | [email protected] "}" | 38 | [email protected] |
39 | [email protected] "\n " | 39 | [email protected] "for" |
40 | [email protected] | 40 | [email protected] " " |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] "for" | 42 | [email protected] |
43 | [email protected] " " | 43 | [email protected] "i" |
44 | [email protected] | 44 | [email protected] " " |
45 | [email protected] | 45 | [email protected] "in" |
46 | [email protected] "i" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] "in" | 48 | [email protected] "break" |
49 | [email protected] " " | 49 | [email protected] " " |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] "break" | 51 | [email protected] "{" |
52 | [email protected] " " | 52 | [email protected] "}" |
53 | [email protected] | 53 | [email protected] "\n " |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] "{" | 55 | [email protected] "match" |
56 | [email protected] "}" | 56 | [email protected] " " |
57 | [email protected] "\n " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "break" |
59 | [email protected] "match" | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "{" |
62 | [email protected] "break" | 62 | [email protected] "}" |
63 | [email protected] " " | 63 | [email protected] "\n" |
64 | [email protected] | 64 | [email protected] "}" |
65 | [email protected] "{" | ||
66 | [email protected] "}" | ||
67 | [email protected] "\n" | ||
68 | [email protected] "}" | ||
69 | [email protected] "\n" | 65 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast index 1c1e349e1..48aaf1004 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast | |||
@@ -12,7 +12,6 @@ [email protected] | |||
12 | [email protected] ")" | 12 | [email protected] ")" |
13 | [email protected] " " | 13 | [email protected] " " |
14 | [email protected] | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "{" |
16 | [email protected] "{" | 16 | [email protected] "}" |
17 | [email protected] "}" | ||
18 | [email protected] "\n" | 17 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast index c264dae5e..aed81f9b0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast | |||
@@ -9,26 +9,25 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "x" |
22 | [email protected] "x" | 22 | [email protected] "[" |
23 | [email protected] "[" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "1" |
25 | [email protected] "1" | 25 | [email protected] "]" |
26 | [email protected] "]" | 26 | [email protected] "[" |
27 | [email protected] "[" | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "2" |
29 | [email protected] "2" | 29 | [email protected] "]" |
30 | [email protected] "]" | 30 | [email protected] ";" |
31 | [email protected] ";" | 31 | [email protected] "\n" |
32 | [email protected] "\n" | 32 | [email protected] "}" |
33 | [email protected] "}" | ||
34 | [email protected] "\n" | 33 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast index 24e1ba8a0..67d9595d3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast | |||
@@ -9,21 +9,20 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "(" |
24 | [email protected] "(" | 24 | [email protected] ")" |
25 | [email protected] ")" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] "}" |
28 | [email protected] "}" | ||
29 | [email protected] "\n" | 28 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast index 47462d44e..031e74652 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast | |||
@@ -9,122 +9,115 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "if" |
17 | [email protected] "if" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "true" |
21 | [email protected] "true" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] | 24 | [email protected] "}" |
25 | [email protected] "{" | 25 | [email protected] "\n " |
26 | [email protected] "}" | 26 | [email protected] |
27 | [email protected] "\n " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "loop" |
29 | [email protected] | 29 | [email protected] " " |
30 | [email protected] "loop" | 30 | [email protected] |
31 | [email protected] " " | 31 | [email protected] "{" |
32 | [email protected] | 32 | [email protected] "}" |
33 | [email protected] | 33 | [email protected] "\n " |
34 | [email protected] "{" | 34 | [email protected] |
35 | [email protected] "}" | 35 | [email protected] |
36 | [email protected] "\n " | 36 | [email protected] "match" |
37 | [email protected] | 37 | [email protected] " " |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] "match" | 39 | [email protected] "(" |
40 | [email protected] " " | 40 | [email protected] ")" |
41 | [email protected] | 41 | [email protected] " " |
42 | [email protected] "(" | 42 | [email protected] |
43 | [email protected] ")" | 43 | [email protected] "{" |
44 | [email protected] " " | 44 | [email protected] "}" |
45 | [email protected] | 45 | [email protected] "\n " |
46 | [email protected] "{" | 46 | [email protected] |
47 | [email protected] "}" | 47 | [email protected] |
48 | [email protected] "\n " | 48 | [email protected] "while" |
49 | [email protected] | 49 | [email protected] " " |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] "while" | 51 | [email protected] |
52 | [email protected] " " | 52 | [email protected] "true" |
53 | [email protected] | 53 | [email protected] " " |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] "true" | 55 | [email protected] "{" |
56 | [email protected] " " | 56 | [email protected] "}" |
57 | [email protected] | 57 | [email protected] "\n " |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] "{" | 59 | [email protected] |
60 | [email protected] "}" | 60 | [email protected] "for" |
61 | [email protected] "\n " | 61 | [email protected] " " |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "_" |
64 | [email protected] "for" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] "in" |
66 | [email protected] | 66 | [email protected] " " |
67 | [email protected] "_" | 67 | [email protected] |
68 | [email protected] " " | 68 | [email protected] "(" |
69 | [email protected] "in" | 69 | [email protected] ")" |
70 | [email protected] " " | 70 | [email protected] " " |
71 | [email protected] | 71 | [email protected] |
72 | [email protected] "(" | 72 | [email protected] "{" |
73 | [email protected] ")" | 73 | [email protected] "}" |
74 | [email protected] " " | 74 | [email protected] "\n " |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] "{" | 77 | [email protected] "{" |
78 | [email protected] "}" | 78 | [email protected] "}" |
79 | [email protected] "\n " | 79 | [email protected] "\n " |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "{" |
83 | [email protected] "{" | 83 | [email protected] "}" |
84 | [email protected] "}" | 84 | [email protected] "\n " |
85 | [email protected] "\n " | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] "{" | 89 | [email protected] |
90 | [email protected] "}" | 90 | [email protected] "macro_rules" |
91 | [email protected] "\n " | 91 | [email protected] "!" |
92 | [email protected] | 92 | [email protected] " " |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] "test" |
95 | [email protected] | 95 | [email protected] " " |
96 | [email protected] | 96 | [email protected] |
97 | [email protected] "macro_rules" | 97 | [email protected] "{" |
98 | [email protected] "!" | 98 | [email protected] "\n " |
99 | [email protected] " " | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] "(" |
101 | [email protected] "test" | 101 | [email protected] ")" |
102 | [email protected] " " | 102 | [email protected] " " |
103 | [email protected] | 103 | [email protected] "=" |
104 | [email protected] "{" | 104 | [email protected] ">" |
105 | [email protected] "\n " | 105 | [email protected] " " |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] "(" | 107 | [email protected] "{" |
108 | [email protected] ")" | 108 | [email protected] "}" |
109 | [email protected] " " | 109 | [email protected] "\n " |
110 | [email protected] "=" | 110 | [email protected] "}" |
111 | [email protected] ">" | 111 | [email protected] "\n " |
112 | [email protected] " " | 112 | [email protected] |
113 | [email protected] | 113 | [email protected] |
114 | [email protected] "{" | 114 | [email protected] |
115 | [email protected] "}" | 115 | [email protected] |
116 | [email protected] "\n " | 116 | [email protected] "test" |
117 | [email protected] "}" | 117 | [email protected] "!" |
118 | [email protected] "\n " | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] "{" |
120 | [email protected] | 120 | [email protected] "}" |
121 | [email protected] | 121 | [email protected] "\n" |
122 | [email protected] | 122 | [email protected] "}" |
123 | [email protected] "test" | ||
124 | [email protected] "!" | ||
125 | [email protected] | ||
126 | [email protected] "{" | ||
127 | [email protected] "}" | ||
128 | [email protected] "\n" | ||
129 | [email protected] "}" | ||
130 | [email protected] "\n" | 123 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast index a51fb5511..816e49310 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast | |||
@@ -13,7 +13,6 @@ [email protected] | |||
13 | [email protected] ")" | 13 | [email protected] ")" |
14 | [email protected] " " | 14 | [email protected] " " |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "{" |
17 | [email protected] "{" | 17 | [email protected] "}" |
18 | [email protected] "}" | ||
19 | [email protected] "\n" | 18 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast index 61b47bf35..d48ef865c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast | |||
@@ -9,9 +9,8 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "}" |
14 | [email protected] "}" | ||
15 | [email protected] "\n" | 14 | [email protected] "\n" |
16 | [email protected] | 15 | [email protected] |
17 | [email protected] "fn" | 16 | [email protected] "fn" |
@@ -34,9 +33,8 @@ [email protected] | |||
34 | [email protected] ")" | 33 | [email protected] ")" |
35 | [email protected] " " | 34 | [email protected] " " |
36 | [email protected] | 35 | [email protected] |
37 | [email protected] | 36 | [email protected] "{" |
38 | [email protected] "{" | 37 | [email protected] "}" |
39 | [email protected] "}" | ||
40 | [email protected] "\n" | 38 | [email protected] "\n" |
41 | [email protected] | 39 | [email protected] |
42 | [email protected] "fn" | 40 | [email protected] "fn" |
@@ -61,9 +59,8 @@ [email protected] | |||
61 | [email protected] ")" | 59 | [email protected] ")" |
62 | [email protected] " " | 60 | [email protected] " " |
63 | [email protected] | 61 | [email protected] |
64 | [email protected] | 62 | [email protected] "{" |
65 | [email protected] "{" | 63 | [email protected] "}" |
66 | [email protected] "}" | ||
67 | [email protected] "\n" | 64 | [email protected] "\n" |
68 | [email protected] | 65 | [email protected] |
69 | [email protected] "fn" | 66 | [email protected] "fn" |
@@ -97,7 +94,6 @@ [email protected] | |||
97 | [email protected] ")" | 94 | [email protected] ")" |
98 | [email protected] " " | 95 | [email protected] " " |
99 | [email protected] | 96 | [email protected] |
100 | [email protected] | 97 | [email protected] "{" |
101 | [email protected] "{" | 98 | [email protected] "}" |
102 | [email protected] "}" | ||
103 | [email protected] "\n" | 99 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast index 89d435d1f..e4455cd3e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast | |||
@@ -9,28 +9,26 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "for" |
17 | [email protected] "for" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] "in" |
23 | [email protected] "in" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "[" |
26 | [email protected] "[" | 26 | [email protected] "]" |
27 | [email protected] "]" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "{" |
30 | [email protected] | 30 | [email protected] "}" |
31 | [email protected] "{" | 31 | [email protected] ";" |
32 | [email protected] "}" | 32 | [email protected] "\n" |
33 | [email protected] ";" | 33 | [email protected] "}" |
34 | [email protected] "\n" | ||
35 | [email protected] "}" | ||
36 | [email protected] "\n" | 34 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast index 57b4d0c4f..8a8743060 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast | |||
@@ -11,7 +11,6 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "}" |
16 | [email protected] "}" | ||
17 | [email protected] "\n" | 16 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index ed6f6f326..9f966ff8a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast | |||
@@ -9,125 +9,124 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "S" |
22 | [email protected] "S" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] "{" | 25 | [email protected] "}" |
26 | [email protected] "}" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] "=" |
28 | [email protected] "=" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "(" |
31 | [email protected] "(" | 31 | [email protected] ")" |
32 | [email protected] ")" | 32 | [email protected] ";" |
33 | [email protected] ";" | 33 | [email protected] "\n " |
34 | [email protected] "\n " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "let" |
36 | [email protected] "let" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "S" |
42 | [email protected] "S" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "{" |
45 | [email protected] "{" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "f" |
50 | [email protected] "f" | 50 | [email protected] "," |
51 | [email protected] "," | 51 | [email protected] " " |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "ref" |
55 | [email protected] "ref" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] "mut" |
57 | [email protected] "mut" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "g" |
60 | [email protected] "g" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] "}" |
62 | [email protected] "}" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] "=" |
64 | [email protected] "=" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "(" |
67 | [email protected] "(" | 67 | [email protected] ")" |
68 | [email protected] ")" | 68 | [email protected] ";" |
69 | [email protected] ";" | 69 | [email protected] "\n " |
70 | [email protected] "\n " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "let" |
72 | [email protected] "let" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "S" |
78 | [email protected] "S" | 78 | [email protected] " " |
79 | [email protected] " " | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "{" |
81 | [email protected] "{" | 81 | [email protected] " " |
82 | [email protected] " " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "h" |
85 | [email protected] "h" | 85 | [email protected] ":" |
86 | [email protected] ":" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "_" |
89 | [email protected] "_" | 89 | [email protected] "," |
90 | [email protected] "," | 90 | [email protected] " " |
91 | [email protected] " " | 91 | [email protected] ".." |
92 | [email protected] ".." | 92 | [email protected] "}" |
93 | [email protected] "}" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] "=" |
95 | [email protected] "=" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] |
97 | [email protected] | 97 | [email protected] "(" |
98 | [email protected] "(" | 98 | [email protected] ")" |
99 | [email protected] ")" | 99 | [email protected] ";" |
100 | [email protected] ";" | 100 | [email protected] "\n " |
101 | [email protected] "\n " | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] "let" |
103 | [email protected] "let" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "S" |
109 | [email protected] "S" | 109 | [email protected] " " |
110 | [email protected] " " | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] "{" |
112 | [email protected] "{" | 112 | [email protected] " " |
113 | [email protected] " " | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] "h" |
116 | [email protected] "h" | 116 | [email protected] ":" |
117 | [email protected] ":" | 117 | [email protected] " " |
118 | [email protected] " " | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] "_" |
120 | [email protected] "_" | 120 | [email protected] "," |
121 | [email protected] "," | 121 | [email protected] " " |
122 | [email protected] " " | 122 | [email protected] "}" |
123 | [email protected] "}" | 123 | [email protected] " " |
124 | [email protected] " " | 124 | [email protected] "=" |
125 | [email protected] "=" | 125 | [email protected] " " |
126 | [email protected] " " | 126 | [email protected] |
127 | [email protected] | 127 | [email protected] "(" |
128 | [email protected] "(" | 128 | [email protected] ")" |
129 | [email protected] ")" | 129 | [email protected] ";" |
130 | [email protected] ";" | 130 | [email protected] "\n" |
131 | [email protected] "\n" | 131 | [email protected] "}" |
132 | [email protected] "}" | ||
133 | [email protected] "\n" | 132 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast index 461c61914..9b3bef04e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast | |||
@@ -9,47 +9,46 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "[" |
17 | [email protected] "[" | 17 | [email protected] "]" |
18 | [email protected] "]" | 18 | [email protected] ";" |
19 | [email protected] ";" | 19 | [email protected] "\n " |
20 | [email protected] "\n " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "[" |
23 | [email protected] "[" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "1" |
25 | [email protected] "1" | 25 | [email protected] "]" |
26 | [email protected] "]" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "[" |
31 | [email protected] "[" | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "1" |
33 | [email protected] "1" | 33 | [email protected] "," |
34 | [email protected] "," | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "2" |
37 | [email protected] "2" | 37 | [email protected] "," |
38 | [email protected] "," | 38 | [email protected] "]" |
39 | [email protected] "]" | 39 | [email protected] ";" |
40 | [email protected] ";" | 40 | [email protected] "\n " |
41 | [email protected] "\n " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "[" |
44 | [email protected] "[" | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "1" |
46 | [email protected] "1" | 46 | [email protected] ";" |
47 | [email protected] ";" | 47 | [email protected] " " |
48 | [email protected] " " | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "2" |
50 | [email protected] "2" | 50 | [email protected] "]" |
51 | [email protected] "]" | 51 | [email protected] ";" |
52 | [email protected] ";" | 52 | [email protected] "\n" |
53 | [email protected] "\n" | 53 | [email protected] "}" |
54 | [email protected] "}" | ||
55 | [email protected] "\n" | 54 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast deleted file mode 100644 index 8b2323cf2..000000000 --- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | [email protected] | ||
2 | [email protected] | ||
3 | [email protected] "fn" | ||
4 | [email protected] " " | ||
5 | [email protected] | ||
6 | [email protected] "foo" | ||
7 | [email protected] | ||
8 | [email protected] "(" | ||
9 | [email protected] ")" | ||
10 | [email protected] " " | ||
11 | [email protected] | ||
12 | [email protected] | ||
13 | [email protected] "{" | ||
14 | [email protected] "\n " | ||
15 | [email protected] | ||
16 | [email protected] | ||
17 | [email protected] | ||
18 | [email protected] "{" | ||
19 | [email protected] "}" | ||
20 | [email protected] ";" | ||
21 | [email protected] "\n " | ||
22 | [email protected] | ||
23 | [email protected] | ||
24 | [email protected] "unsafe" | ||
25 | [email protected] " " | ||
26 | [email protected] | ||
27 | [email protected] "{" | ||
28 | [email protected] "}" | ||
29 | [email protected] ";" | ||
30 | [email protected] "\n " | ||
31 | [email protected] | ||
32 | [email protected] | ||
33 | [email protected] | ||
34 | [email protected] "\'label" | ||
35 | [email protected] ":" | ||
36 | [email protected] " " | ||
37 | [email protected] | ||
38 | [email protected] "{" | ||
39 | [email protected] "}" | ||
40 | [email protected] ";" | ||
41 | [email protected] "\n" | ||
42 | [email protected] "}" | ||
43 | [email protected] "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs deleted file mode 100644 index 2fed74c5e..000000000 --- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | fn foo() { | ||
2 | {}; | ||
3 | unsafe {}; | ||
4 | 'label: {}; | ||
5 | } | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast index 73c314e07..e64717152 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast | |||
@@ -9,132 +9,127 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "|" |
18 | [email protected] "|" | 18 | [email protected] "|" |
19 | [email protected] "|" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "(" |
22 | [email protected] "(" | 22 | [email protected] ")" |
23 | [email protected] ")" | 23 | [email protected] ";" |
24 | [email protected] ";" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "|" |
29 | [email protected] "|" | 29 | [email protected] "|" |
30 | [email protected] "|" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "->" |
33 | [email protected] "->" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "i32" |
39 | [email protected] "i32" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "{" |
42 | [email protected] | 42 | [email protected] " " |
43 | [email protected] "{" | 43 | [email protected] |
44 | [email protected] " " | 44 | [email protected] "92" |
45 | [email protected] | 45 | [email protected] " " |
46 | [email protected] "92" | 46 | [email protected] "}" |
47 | [email protected] " " | 47 | [email protected] ";" |
48 | [email protected] "}" | 48 | [email protected] "\n " |
49 | [email protected] ";" | 49 | [email protected] |
50 | [email protected] "\n " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "|" |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] "|" | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "x" |
57 | [email protected] | 57 | [email protected] "|" |
58 | [email protected] "x" | 58 | [email protected] " " |
59 | [email protected] "|" | 59 | [email protected] |
60 | [email protected] " " | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "x" |
64 | [email protected] | 64 | [email protected] ";" |
65 | [email protected] "x" | 65 | [email protected] "\n " |
66 | [email protected] ";" | 66 | [email protected] |
67 | [email protected] "\n " | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] "move" |
69 | [email protected] | 69 | [email protected] " " |
70 | [email protected] "move" | 70 | [email protected] |
71 | [email protected] " " | 71 | [email protected] "|" |
72 | [email protected] | 72 | [email protected] |
73 | [email protected] "|" | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "x" |
76 | [email protected] | 76 | [email protected] ":" |
77 | [email protected] "x" | 77 | [email protected] " " |
78 | [email protected] ":" | 78 | [email protected] |
79 | [email protected] " " | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "i32" |
83 | [email protected] | 83 | [email protected] "," |
84 | [email protected] "i32" | 84 | [email protected] "|" |
85 | [email protected] "," | 85 | [email protected] " " |
86 | [email protected] "|" | 86 | [email protected] |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "x" |
91 | [email protected] | 91 | [email protected] ";" |
92 | [email protected] "x" | 92 | [email protected] "\n " |
93 | [email protected] ";" | 93 | [email protected] |
94 | [email protected] "\n " | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "async" |
96 | [email protected] | 96 | [email protected] " " |
97 | [email protected] "async" | 97 | [email protected] |
98 | [email protected] " " | 98 | [email protected] "|" |
99 | [email protected] | 99 | [email protected] "|" |
100 | [email protected] "|" | 100 | [email protected] " " |
101 | [email protected] "|" | 101 | [email protected] |
102 | [email protected] " " | 102 | [email protected] "{" |
103 | [email protected] | 103 | [email protected] "}" |
104 | [email protected] | 104 | [email protected] ";" |
105 | [email protected] "{" | 105 | [email protected] "\n " |
106 | [email protected] "}" | 106 | [email protected] |
107 | [email protected] ";" | 107 | [email protected] |
108 | [email protected] "\n " | 108 | [email protected] "move" |
109 | [email protected] | 109 | [email protected] " " |
110 | [email protected] | 110 | [email protected] |
111 | [email protected] "move" | 111 | [email protected] "|" |
112 | [email protected] " " | 112 | [email protected] "|" |
113 | [email protected] | 113 | [email protected] " " |
114 | [email protected] "|" | 114 | [email protected] |
115 | [email protected] "|" | 115 | [email protected] "{" |
116 | [email protected] " " | 116 | [email protected] "}" |
117 | [email protected] | 117 | [email protected] ";" |
118 | [email protected] | 118 | [email protected] "\n " |
119 | [email protected] "{" | 119 | [email protected] |
120 | [email protected] "}" | 120 | [email protected] |
121 | [email protected] ";" | 121 | [email protected] "async" |
122 | [email protected] "\n " | 122 | [email protected] " " |
123 | [email protected] | 123 | [email protected] "move" |
124 | [email protected] | 124 | [email protected] " " |
125 | [email protected] "async" | 125 | [email protected] |
126 | [email protected] " " | 126 | [email protected] "|" |
127 | [email protected] "move" | 127 | [email protected] "|" |
128 | [email protected] " " | 128 | [email protected] " " |
129 | [email protected] | 129 | [email protected] |
130 | [email protected] "|" | 130 | [email protected] "{" |
131 | [email protected] "|" | 131 | [email protected] "}" |
132 | [email protected] " " | 132 | [email protected] ";" |
133 | [email protected] | 133 | [email protected] "\n" |
134 | [email protected] | 134 | [email protected] "}" |
135 | [email protected] "{" | ||
136 | [email protected] "}" | ||
137 | [email protected] ";" | ||
138 | [email protected] "\n" | ||
139 | [email protected] "}" | ||
140 | [email protected] "\n" | 135 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast index 5392b1a74..98963dc62 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast | |||
@@ -9,55 +9,54 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] "." |
22 | [email protected] "." | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "foo" |
24 | [email protected] "foo" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "(" |
26 | [email protected] "(" | 26 | [email protected] ")" |
27 | [email protected] ")" | 27 | [email protected] ";" |
28 | [email protected] ";" | 28 | [email protected] "\n " |
29 | [email protected] "\n " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "y" |
36 | [email protected] "y" | 36 | [email protected] "." |
37 | [email protected] "." | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "bar" |
39 | [email protected] "bar" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "::" |
41 | [email protected] "::" | 41 | [email protected] "<" |
42 | [email protected] "<" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "T" |
48 | [email protected] "T" | 48 | [email protected] ">" |
49 | [email protected] ">" | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "(" |
51 | [email protected] "(" | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "1" |
53 | [email protected] "1" | 53 | [email protected] "," |
54 | [email protected] "," | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "2" |
57 | [email protected] "2" | 57 | [email protected] "," |
58 | [email protected] "," | 58 | [email protected] ")" |
59 | [email protected] ")" | 59 | [email protected] ";" |
60 | [email protected] ";" | 60 | [email protected] "\n" |
61 | [email protected] "\n" | 61 | [email protected] "}" |
62 | [email protected] "}" | ||
63 | [email protected] "\n" | 62 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast index 54f18adac..ea603e2c9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast | |||
@@ -9,31 +9,30 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "(" |
17 | [email protected] "(" | 17 | [email protected] ")" |
18 | [email protected] ")" | 18 | [email protected] ";" |
19 | [email protected] ";" | 19 | [email protected] "\n " |
20 | [email protected] "\n " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "1" |
25 | [email protected] "1" | 25 | [email protected] ")" |
26 | [email protected] ")" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "(" |
31 | [email protected] "(" | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "1" |
33 | [email protected] "1" | 33 | [email protected] "," |
34 | [email protected] "," | 34 | [email protected] ")" |
35 | [email protected] ")" | 35 | [email protected] ";" |
36 | [email protected] ";" | 36 | [email protected] "\n" |
37 | [email protected] "\n" | 37 | [email protected] "}" |
38 | [email protected] "}" | ||
39 | [email protected] "\n" | 38 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast index 6c9e45684..30ff96a7c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast | |||
@@ -9,60 +9,56 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "\'a" |
18 | [email protected] "\'a" | 18 | [email protected] ":" |
19 | [email protected] ":" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "loop" |
21 | [email protected] "loop" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] | 24 | [email protected] "}" |
25 | [email protected] "{" | 25 | [email protected] "\n " |
26 | [email protected] "}" | 26 | [email protected] |
27 | [email protected] "\n " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "\'b" |
30 | [email protected] | 30 | [email protected] ":" |
31 | [email protected] "\'b" | 31 | [email protected] " " |
32 | [email protected] ":" | 32 | [email protected] "while" |
33 | [email protected] " " | 33 | [email protected] " " |
34 | [email protected] "while" | 34 | [email protected] |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "true" |
37 | [email protected] | 37 | [email protected] " " |
38 | [email protected] "true" | 38 | [email protected] |
39 | [email protected] " " | 39 | [email protected] "{" |
40 | [email protected] | 40 | [email protected] "}" |
41 | [email protected] | 41 | [email protected] "\n " |
42 | [email protected] "{" | 42 | [email protected] |
43 | [email protected] "}" | 43 | [email protected] |
44 | [email protected] "\n " | 44 | [email protected] "\'c" |
45 | [email protected] | 45 | [email protected] ":" |
46 | [email protected] | 46 | [email protected] " " |
47 | [email protected] "\'c" | 47 | [email protected] "for" |
48 | [email protected] ":" | 48 | [email protected] " " |
49 | [email protected] " " | 49 | [email protected] |
50 | [email protected] "for" | 50 | [email protected] |
51 | [email protected] " " | 51 | [email protected] "x" |
52 | [email protected] | 52 | [email protected] " " |
53 | [email protected] | 53 | [email protected] "in" |
54 | [email protected] "x" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] "in" | 56 | [email protected] "(" |
57 | [email protected] " " | 57 | [email protected] ")" |
58 | [email protected] | 58 | [email protected] " " |
59 | [email protected] "(" | 59 | [email protected] |
60 | [email protected] ")" | 60 | [email protected] "{" |
61 | [email protected] " " | 61 | [email protected] "}" |
62 | [email protected] | 62 | [email protected] "\n" |
63 | [email protected] | 63 | [email protected] "}" |
64 | [email protected] "{" | ||
65 | [email protected] "}" | ||
66 | [email protected] "\n" | ||
67 | [email protected] "}" | ||
68 | [email protected] "\n" | 64 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast index a1c5475e7..b58f40ac1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast | |||
@@ -9,82 +9,81 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "a" |
22 | [email protected] "a" | 22 | [email protected] "," |
23 | [email protected] "," | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "b" |
27 | [email protected] "b" | 27 | [email protected] "," |
28 | [email protected] "," | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] ".." |
31 | [email protected] ".." | 31 | [email protected] ")" |
32 | [email protected] ")" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] "=" |
34 | [email protected] "=" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "(" |
37 | [email protected] "(" | 37 | [email protected] ")" |
38 | [email protected] ")" | 38 | [email protected] ";" |
39 | [email protected] ";" | 39 | [email protected] "\n " |
40 | [email protected] "\n " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "let" |
42 | [email protected] "let" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "(" |
45 | [email protected] "(" | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "a" |
48 | [email protected] "a" | 48 | [email protected] "," |
49 | [email protected] "," | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] "=" |
52 | [email protected] "=" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "(" |
55 | [email protected] "(" | 55 | [email protected] ")" |
56 | [email protected] ")" | 56 | [email protected] ";" |
57 | [email protected] ";" | 57 | [email protected] "\n " |
58 | [email protected] "\n " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "let" |
60 | [email protected] "let" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "(" |
63 | [email protected] "(" | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] ".." |
65 | [email protected] ".." | 65 | [email protected] ")" |
66 | [email protected] ")" | 66 | [email protected] " " |
67 | [email protected] " " | 67 | [email protected] "=" |
68 | [email protected] "=" | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "(" |
71 | [email protected] "(" | 71 | [email protected] ")" |
72 | [email protected] ")" | 72 | [email protected] ";" |
73 | [email protected] ";" | 73 | [email protected] "\n " |
74 | [email protected] "\n " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "let" |
76 | [email protected] "let" | 76 | [email protected] " " |
77 | [email protected] " " | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] "(" |
79 | [email protected] "(" | 79 | [email protected] ")" |
80 | [email protected] ")" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "=" |
82 | [email protected] "=" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "(" |
85 | [email protected] "(" | 85 | [email protected] ")" |
86 | [email protected] ")" | 86 | [email protected] ";" |
87 | [email protected] ";" | 87 | [email protected] "\n" |
88 | [email protected] "\n" | 88 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n" | 89 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast index 42a770a83..b67714c17 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast | |||
@@ -9,120 +9,119 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "a" |
20 | [email protected] "a" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "(" |
25 | [email protected] "(" | 25 | [email protected] ")" |
26 | [email protected] ")" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "let" |
30 | [email protected] "let" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "mut" |
33 | [email protected] "mut" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "b" |
36 | [email protected] "b" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=" |
38 | [email protected] "=" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] ")" |
42 | [email protected] ")" | 42 | [email protected] ";" |
43 | [email protected] ";" | 43 | [email protected] "\n " |
44 | [email protected] "\n " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "let" |
46 | [email protected] "let" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "ref" |
49 | [email protected] "ref" | 49 | [email protected] " " |
50 | [email protected] " " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "c" |
52 | [email protected] "c" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] "=" |
54 | [email protected] "=" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "(" |
57 | [email protected] "(" | 57 | [email protected] ")" |
58 | [email protected] ")" | 58 | [email protected] ";" |
59 | [email protected] ";" | 59 | [email protected] "\n " |
60 | [email protected] "\n " | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "let" |
62 | [email protected] "let" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "ref" |
65 | [email protected] "ref" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] "mut" |
67 | [email protected] "mut" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "d" |
70 | [email protected] "d" | 70 | [email protected] " " |
71 | [email protected] " " | 71 | [email protected] "=" |
72 | [email protected] "=" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "(" |
75 | [email protected] "(" | 75 | [email protected] ")" |
76 | [email protected] ")" | 76 | [email protected] ";" |
77 | [email protected] ";" | 77 | [email protected] "\n " |
78 | [email protected] "\n " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "let" |
80 | [email protected] "let" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "e" |
84 | [email protected] "e" | 84 | [email protected] " " |
85 | [email protected] " " | 85 | [email protected] "@" |
86 | [email protected] "@" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "_" |
89 | [email protected] "_" | 89 | [email protected] " " |
90 | [email protected] " " | 90 | [email protected] "=" |
91 | [email protected] "=" | 91 | [email protected] " " |
92 | [email protected] " " | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "(" |
94 | [email protected] "(" | 94 | [email protected] ")" |
95 | [email protected] ")" | 95 | [email protected] ";" |
96 | [email protected] ";" | 96 | [email protected] "\n " |
97 | [email protected] "\n " | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "let" |
99 | [email protected] "let" | 99 | [email protected] " " |
100 | [email protected] " " | 100 | [email protected] |
101 | [email protected] | 101 | [email protected] "ref" |
102 | [email protected] "ref" | 102 | [email protected] " " |
103 | [email protected] " " | 103 | [email protected] "mut" |
104 | [email protected] "mut" | 104 | [email protected] " " |
105 | [email protected] " " | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] "f" |
107 | [email protected] "f" | 107 | [email protected] " " |
108 | [email protected] " " | 108 | [email protected] "@" |
109 | [email protected] "@" | 109 | [email protected] " " |
110 | [email protected] " " | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] "g" |
113 | [email protected] "g" | 113 | [email protected] " " |
114 | [email protected] " " | 114 | [email protected] "@" |
115 | [email protected] "@" | 115 | [email protected] " " |
116 | [email protected] " " | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] "_" |
118 | [email protected] "_" | 118 | [email protected] " " |
119 | [email protected] " " | 119 | [email protected] "=" |
120 | [email protected] "=" | 120 | [email protected] " " |
121 | [email protected] " " | 121 | [email protected] |
122 | [email protected] | 122 | [email protected] "(" |
123 | [email protected] "(" | 123 | [email protected] ")" |
124 | [email protected] ")" | 124 | [email protected] ";" |
125 | [email protected] ";" | 125 | [email protected] "\n" |
126 | [email protected] "\n" | 126 | [email protected] "}" |
127 | [email protected] "}" | ||
128 | [email protected] "\n" | 127 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast index 5414c90b8..5de480da9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast | |||
@@ -8,50 +8,48 @@ [email protected] | |||
8 | [email protected] "(" | 8 | [email protected] "(" |
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] | 10 | [email protected] |
11 | [email protected] | 11 | [email protected] "{" |
12 | [email protected] "{" | 12 | [email protected] "\n " |
13 | [email protected] "\n " | 13 | [email protected] ";" |
14 | [email protected] ";" | 14 | [email protected] ";" |
15 | [email protected] ";" | 15 | [email protected] ";" |
16 | [email protected] ";" | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "some_expr" |
23 | [email protected] "some_expr" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "(" |
25 | [email protected] "(" | 25 | [email protected] ")" |
26 | [email protected] ")" | 26 | [email protected] ";" |
27 | [email protected] ";" | 27 | [email protected] ";" |
28 | [email protected] ";" | 28 | [email protected] ";" |
29 | [email protected] ";" | 29 | [email protected] ";" |
30 | [email protected] ";" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "{" |
33 | [email protected] | 33 | [email protected] ";" |
34 | [email protected] "{" | 34 | [email protected] ";" |
35 | [email protected] ";" | 35 | [email protected] ";" |
36 | [email protected] ";" | 36 | [email protected] "}" |
37 | [email protected] ";" | 37 | [email protected] ";" |
38 | [email protected] "}" | 38 | [email protected] ";" |
39 | [email protected] ";" | 39 | [email protected] ";" |
40 | [email protected] ";" | 40 | [email protected] ";" |
41 | [email protected] ";" | 41 | [email protected] |
42 | [email protected] ";" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "Ok" |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] "Ok" | 48 | [email protected] "(" |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] "(" | 50 | [email protected] "(" |
51 | [email protected] | 51 | [email protected] ")" |
52 | [email protected] "(" | 52 | [email protected] ")" |
53 | [email protected] ")" | 53 | [email protected] "\n" |
54 | [email protected] ")" | 54 | [email protected] "}" |
55 | [email protected] "\n" | ||
56 | [email protected] "}" | ||
57 | [email protected] "\n" | 55 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast index 8e080fb60..e152c6b6c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast | |||
@@ -9,40 +9,39 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "_" |
27 | [email protected] "_" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "if" |
30 | [email protected] "if" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "foo" |
36 | [email protected] "foo" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=>" |
38 | [email protected] "=>" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] ")" |
42 | [email protected] ")" | 42 | [email protected] "," |
43 | [email protected] "," | 43 | [email protected] "\n " |
44 | [email protected] "\n " | 44 | [email protected] "}" |
45 | [email protected] "}" | 45 | [email protected] "\n" |
46 | [email protected] "\n" | 46 | [email protected] "}" |
47 | [email protected] "}" | ||
48 | [email protected] "\n" | 47 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast index 728164f8e..b283ab804 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast | |||
@@ -9,73 +9,72 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "#" |
26 | [email protected] "#" | 26 | [email protected] "!" |
27 | [email protected] "!" | 27 | [email protected] "[" |
28 | [email protected] "[" | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "doc" |
32 | [email protected] "doc" | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "(" |
34 | [email protected] "(" | 34 | [email protected] "\"Inner attribute\"" |
35 | [email protected] "\"Inner attribute\"" | 35 | [email protected] ")" |
36 | [email protected] ")" | 36 | [email protected] "]" |
37 | [email protected] "]" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "#" |
40 | [email protected] "#" | 40 | [email protected] "!" |
41 | [email protected] "!" | 41 | [email protected] "[" |
42 | [email protected] "[" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "doc" |
46 | [email protected] "doc" | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "(" |
48 | [email protected] "(" | 48 | [email protected] "\"Can be\"" |
49 | [email protected] "\"Can be\"" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] "]" |
51 | [email protected] "]" | 51 | [email protected] "\n " |
52 | [email protected] "\n " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "#" |
54 | [email protected] "#" | 54 | [email protected] "!" |
55 | [email protected] "!" | 55 | [email protected] "[" |
56 | [email protected] "[" | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "doc" |
60 | [email protected] "doc" | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "(" |
62 | [email protected] "(" | 62 | [email protected] "\"Stacked\"" |
63 | [email protected] "\"Stacked\"" | 63 | [email protected] ")" |
64 | [email protected] ")" | 64 | [email protected] "]" |
65 | [email protected] "]" | 65 | [email protected] "\n " |
66 | [email protected] "\n " | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] "_" |
69 | [email protected] "_" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] "=>" |
71 | [email protected] "=>" | 71 | [email protected] " " |
72 | [email protected] " " | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "(" |
74 | [email protected] "(" | 74 | [email protected] ")" |
75 | [email protected] ")" | 75 | [email protected] "," |
76 | [email protected] "," | 76 | [email protected] "\n " |
77 | [email protected] "\n " | 77 | [email protected] "}" |
78 | [email protected] "}" | 78 | [email protected] "\n" |
79 | [email protected] "\n" | 79 | [email protected] "}" |
80 | [email protected] "}" | ||
81 | [email protected] "\n" | 80 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast index 6123885e3..9d5470914 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast | |||
@@ -9,138 +9,137 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "#" |
27 | [email protected] "#" | 27 | [email protected] "[" |
28 | [email protected] "[" | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "cfg" |
32 | [email protected] "cfg" | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "(" |
34 | [email protected] "(" | 34 | [email protected] "feature" |
35 | [email protected] "feature" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] "=" |
37 | [email protected] "=" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] "\"some\"" |
39 | [email protected] "\"some\"" | 39 | [email protected] ")" |
40 | [email protected] ")" | 40 | [email protected] "]" |
41 | [email protected] "]" | 41 | [email protected] "\n " |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "_" |
44 | [email protected] "_" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "=>" |
46 | [email protected] "=>" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] "," |
51 | [email protected] "," | 51 | [email protected] "\n " |
52 | [email protected] "\n " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "#" |
55 | [email protected] "#" | 55 | [email protected] "[" |
56 | [email protected] "[" | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "cfg" |
60 | [email protected] "cfg" | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "(" |
62 | [email protected] "(" | 62 | [email protected] "feature" |
63 | [email protected] "feature" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] "=" |
65 | [email protected] "=" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] "\"other\"" |
67 | [email protected] "\"other\"" | 67 | [email protected] ")" |
68 | [email protected] ")" | 68 | [email protected] "]" |
69 | [email protected] "]" | 69 | [email protected] "\n " |
70 | [email protected] "\n " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "_" |
72 | [email protected] "_" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] "=>" |
74 | [email protected] "=>" | 74 | [email protected] " " |
75 | [email protected] " " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "(" |
77 | [email protected] "(" | 77 | [email protected] ")" |
78 | [email protected] ")" | 78 | [email protected] "," |
79 | [email protected] "," | 79 | [email protected] "\n " |
80 | [email protected] "\n " | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "#" |
83 | [email protected] "#" | 83 | [email protected] "[" |
84 | [email protected] "[" | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "cfg" |
88 | [email protected] "cfg" | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "(" |
90 | [email protected] "(" | 90 | [email protected] "feature" |
91 | [email protected] "feature" | 91 | [email protected] " " |
92 | [email protected] " " | 92 | [email protected] "=" |
93 | [email protected] "=" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] "\"many\"" |
95 | [email protected] "\"many\"" | 95 | [email protected] ")" |
96 | [email protected] ")" | 96 | [email protected] "]" |
97 | [email protected] "]" | 97 | [email protected] "\n " |
98 | [email protected] "\n " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] "#" |
100 | [email protected] "#" | 100 | [email protected] "[" |
101 | [email protected] "[" | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "cfg" |
105 | [email protected] "cfg" | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] "(" |
107 | [email protected] "(" | 107 | [email protected] "feature" |
108 | [email protected] "feature" | 108 | [email protected] " " |
109 | [email protected] " " | 109 | [email protected] "=" |
110 | [email protected] "=" | 110 | [email protected] " " |
111 | [email protected] " " | 111 | [email protected] "\"attributes\"" |
112 | [email protected] "\"attributes\"" | 112 | [email protected] ")" |
113 | [email protected] ")" | 113 | [email protected] "]" |
114 | [email protected] "]" | 114 | [email protected] "\n " |
115 | [email protected] "\n " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] "#" |
117 | [email protected] "#" | 117 | [email protected] "[" |
118 | [email protected] "[" | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] "cfg" |
122 | [email protected] "cfg" | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] "(" |
124 | [email protected] "(" | 124 | [email protected] "feature" |
125 | [email protected] "feature" | 125 | [email protected] " " |
126 | [email protected] " " | 126 | [email protected] "=" |
127 | [email protected] "=" | 127 | [email protected] " " |
128 | [email protected] " " | 128 | [email protected] "\"before\"" |
129 | [email protected] "\"before\"" | 129 | [email protected] ")" |
130 | [email protected] ")" | 130 | [email protected] "]" |
131 | [email protected] "]" | 131 | [email protected] "\n " |
132 | [email protected] "\n " | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] "_" |
134 | [email protected] "_" | 134 | [email protected] " " |
135 | [email protected] " " | 135 | [email protected] "=>" |
136 | [email protected] "=>" | 136 | [email protected] " " |
137 | [email protected] " " | 137 | [email protected] |
138 | [email protected] | 138 | [email protected] "(" |
139 | [email protected] "(" | 139 | [email protected] ")" |
140 | [email protected] ")" | 140 | [email protected] "," |
141 | [email protected] "," | 141 | [email protected] "\n " |
142 | [email protected] "\n " | 142 | [email protected] "}" |
143 | [email protected] "}" | 143 | [email protected] "\n" |
144 | [email protected] "\n" | 144 | [email protected] "}" |
145 | [email protected] "}" | ||
146 | [email protected] "\n" | 145 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index 67b9c10d5..ada2fc54e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast | |||
@@ -59,8 +59,7 @@ [email protected] | |||
59 | [email protected] ")" | 59 | [email protected] ")" |
60 | [email protected] " " | 60 | [email protected] " " |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "{" |
63 | [email protected] "{" | 63 | [email protected] "\n" |
64 | [email protected] "\n" | 64 | [email protected] "}" |
65 | [email protected] "}" | ||
66 | [email protected] "\n" | 65 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast index baf22a8d7..6178dfe59 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast | |||
@@ -11,7 +11,6 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "}" |
16 | [email protected] "}" | ||
17 | [email protected] "\n" | 16 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast index 16f5b90b6..ced59b7c1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast | |||
@@ -9,24 +9,23 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "crate" |
21 | [email protected] "crate" | 21 | [email protected] "::" |
22 | [email protected] "::" | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "foo" |
25 | [email protected] "foo" | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "(" |
27 | [email protected] "(" | 27 | [email protected] ")" |
28 | [email protected] ")" | 28 | [email protected] ";" |
29 | [email protected] ";" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "}" |
31 | [email protected] "}" | ||
32 | [email protected] "\n" | 31 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast index 07ed14773..97611f7f3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast | |||
@@ -9,40 +9,39 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "S" |
19 | [email protected] "S" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "#" |
26 | [email protected] "#" | 26 | [email protected] "[" |
27 | [email protected] "[" | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "cfg" |
31 | [email protected] "cfg" | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "(" |
33 | [email protected] "(" | 33 | [email protected] "test" |
34 | [email protected] "test" | 34 | [email protected] ")" |
35 | [email protected] ")" | 35 | [email protected] "]" |
36 | [email protected] "]" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "field" |
39 | [email protected] "field" | 39 | [email protected] ":" |
40 | [email protected] ":" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "1" |
43 | [email protected] "1" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "}" |
45 | [email protected] "}" | 45 | [email protected] "\n" |
46 | [email protected] "\n" | 46 | [email protected] "}" |
47 | [email protected] "}" | ||
48 | [email protected] "\n" | 47 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast index 8307d4c15..09221fc54 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast | |||
@@ -9,91 +9,89 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "#" |
17 | [email protected] "#" | 17 | [email protected] "[" |
18 | [email protected] "[" | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "A" |
22 | [email protected] "A" | 22 | [email protected] "]" |
23 | [email protected] "]" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "foo" |
30 | [email protected] "foo" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] ";" |
34 | [email protected] ";" | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "#" |
38 | [email protected] "#" | 38 | [email protected] "[" |
39 | [email protected] "[" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "B" |
43 | [email protected] "B" | 43 | [email protected] "]" |
44 | [email protected] "]" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "bar" |
50 | [email protected] "bar" | 50 | [email protected] "!" |
51 | [email protected] "!" | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "{" |
53 | [email protected] "{" | 53 | [email protected] "}" |
54 | [email protected] "}" | 54 | [email protected] "\n " |
55 | [email protected] "\n " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "#" |
58 | [email protected] "#" | 58 | [email protected] "[" |
59 | [email protected] "[" | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "C" |
63 | [email protected] "C" | 63 | [email protected] "]" |
64 | [email protected] "]" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "#" |
67 | [email protected] "#" | 67 | [email protected] "[" |
68 | [email protected] "[" | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "D" |
72 | [email protected] "D" | 72 | [email protected] "]" |
73 | [email protected] "]" | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "{" |
76 | [email protected] | 76 | [email protected] "}" |
77 | [email protected] "{" | 77 | [email protected] "\n " |
78 | [email protected] "}" | 78 | [email protected] |
79 | [email protected] "\n " | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "#" |
81 | [email protected] | 81 | [email protected] "[" |
82 | [email protected] "#" | 82 | [email protected] |
83 | [email protected] "[" | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] "D" |
86 | [email protected] | 86 | [email protected] "]" |
87 | [email protected] "D" | 87 | [email protected] " " |
88 | [email protected] "]" | 88 | [email protected] |
89 | [email protected] " " | 89 | [email protected] "return" |
90 | [email protected] | 90 | [email protected] " " |
91 | [email protected] "return" | 91 | [email protected] |
92 | [email protected] " " | 92 | [email protected] "(" |
93 | [email protected] | 93 | [email protected] ")" |
94 | [email protected] "(" | 94 | [email protected] ";" |
95 | [email protected] ")" | 95 | [email protected] "\n" |
96 | [email protected] ";" | 96 | [email protected] "}" |
97 | [email protected] "\n" | ||
98 | [email protected] "}" | ||
99 | [email protected] "\n" | 97 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast index 19c47ea25..93cc41533 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast | |||
@@ -9,51 +9,49 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "{" |
17 | [email protected] | 17 | [email protected] " " |
18 | [email protected] "{" | 18 | [email protected] |
19 | [email protected] " " | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "#" |
21 | [email protected] | 21 | [email protected] "[" |
22 | [email protected] "#" | 22 | [email protected] |
23 | [email protected] "[" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "A" |
26 | [email protected] | 26 | [email protected] "]" |
27 | [email protected] "A" | 27 | [email protected] " " |
28 | [email protected] "]" | 28 | [email protected] |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "bar" |
33 | [email protected] | 33 | [email protected] "!" |
34 | [email protected] "bar" | 34 | [email protected] |
35 | [email protected] "!" | 35 | [email protected] "(" |
36 | [email protected] | 36 | [email protected] ")" |
37 | [email protected] "(" | 37 | [email protected] "?" |
38 | [email protected] ")" | 38 | [email protected] " " |
39 | [email protected] "?" | 39 | [email protected] "}" |
40 | [email protected] " " | 40 | [email protected] "\n " |
41 | [email protected] "}" | 41 | [email protected] |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "#" |
44 | [email protected] | 44 | [email protected] "[" |
45 | [email protected] "#" | 45 | [email protected] |
46 | [email protected] "[" | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "B" |
49 | [email protected] | 49 | [email protected] "]" |
50 | [email protected] "B" | 50 | [email protected] " " |
51 | [email protected] "]" | 51 | [email protected] "&" |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] "&" | 53 | [email protected] "(" |
54 | [email protected] | 54 | [email protected] ")" |
55 | [email protected] "(" | 55 | [email protected] "\n" |
56 | [email protected] ")" | 56 | [email protected] "}" |
57 | [email protected] "\n" | ||
58 | [email protected] "}" | ||
59 | [email protected] "\n" | 57 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast index 5630b20af..0901f2348 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast | |||
@@ -13,9 +13,8 @@ [email protected] | |||
13 | [email protected] ")" | 13 | [email protected] ")" |
14 | [email protected] " " | 14 | [email protected] " " |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "{" |
17 | [email protected] "{" | 17 | [email protected] "}" |
18 | [email protected] "}" | ||
19 | [email protected] "\n" | 18 | [email protected] "\n" |
20 | [email protected] | 19 | [email protected] |
21 | [email protected] "const" | 20 | [email protected] "const" |
@@ -31,7 +30,6 @@ [email protected] | |||
31 | [email protected] ")" | 30 | [email protected] ")" |
32 | [email protected] " " | 31 | [email protected] " " |
33 | [email protected] | 32 | [email protected] |
34 | [email protected] | 33 | [email protected] "{" |
35 | [email protected] "{" | 34 | [email protected] "}" |
36 | [email protected] "}" | ||
37 | [email protected] "\n" | 35 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast index 4946ee050..28291afc2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast | |||
@@ -9,29 +9,28 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "m" |
23 | [email protected] "m" | 23 | [email protected] "!" |
24 | [email protected] "!" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "(" |
26 | [email protected] "(" | 26 | [email protected] "x" |
27 | [email protected] "x" | 27 | [email protected] ")" |
28 | [email protected] ")" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "=" |
30 | [email protected] "=" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "0" |
33 | [email protected] "0" | 33 | [email protected] ";" |
34 | [email protected] ";" | 34 | [email protected] "\n" |
35 | [email protected] "\n" | 35 | [email protected] "}" |
36 | [email protected] "}" | ||
37 | [email protected] "\n" | 36 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast index 18fdd9dc9..bb94a05c6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast | |||
@@ -9,121 +9,118 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "a" |
20 | [email protected] "a" | 20 | [email protected] ";" |
21 | [email protected] ";" | 21 | [email protected] "\n " |
22 | [email protected] "\n " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "let" |
24 | [email protected] "let" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "b" |
28 | [email protected] "b" | 28 | [email protected] ":" |
29 | [email protected] ":" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "i32" |
35 | [email protected] "i32" | 35 | [email protected] ";" |
36 | [email protected] ";" | 36 | [email protected] "\n " |
37 | [email protected] "\n " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "let" |
39 | [email protected] "let" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "c" |
43 | [email protected] "c" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "=" |
45 | [email protected] "=" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "92" |
48 | [email protected] "92" | 48 | [email protected] ";" |
49 | [email protected] ";" | 49 | [email protected] "\n " |
50 | [email protected] "\n " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "let" |
52 | [email protected] "let" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "d" |
56 | [email protected] "d" | 56 | [email protected] ":" |
57 | [email protected] ":" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "i32" |
63 | [email protected] "i32" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] "=" |
65 | [email protected] "=" | 65 | [email protected] " " |
66 | [email protected] " " | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] "92" |
68 | [email protected] "92" | 68 | [email protected] ";" |
69 | [email protected] ";" | 69 | [email protected] "\n " |
70 | [email protected] "\n " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "let" |
72 | [email protected] "let" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "e" |
76 | [email protected] "e" | 76 | [email protected] ":" |
77 | [email protected] ":" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "!" |
80 | [email protected] "!" | 80 | [email protected] ";" |
81 | [email protected] ";" | 81 | [email protected] "\n " |
82 | [email protected] "\n " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "let" |
84 | [email protected] "let" | 84 | [email protected] " " |
85 | [email protected] " " | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] "_" |
87 | [email protected] "_" | 87 | [email protected] ":" |
88 | [email protected] ":" | 88 | [email protected] " " |
89 | [email protected] " " | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "!" |
91 | [email protected] "!" | 91 | [email protected] " " |
92 | [email protected] " " | 92 | [email protected] "=" |
93 | [email protected] "=" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "{" |
96 | [email protected] | 96 | [email protected] "}" |
97 | [email protected] "{" | 97 | [email protected] ";" |
98 | [email protected] "}" | 98 | [email protected] "\n " |
99 | [email protected] ";" | 99 | [email protected] |
100 | [email protected] "\n " | 100 | [email protected] "let" |
101 | [email protected] | 101 | [email protected] " " |
102 | [email protected] "let" | 102 | [email protected] |
103 | [email protected] " " | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "f" |
105 | [email protected] | 105 | [email protected] " " |
106 | [email protected] "f" | 106 | [email protected] "=" |
107 | [email protected] " " | 107 | [email protected] " " |
108 | [email protected] "=" | 108 | [email protected] |
109 | [email protected] " " | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] "#" |
111 | [email protected] | 111 | [email protected] "[" |
112 | [email protected] "#" | 112 | [email protected] |
113 | [email protected] "[" | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] "attr" |
116 | [email protected] | 116 | [email protected] "]" |
117 | [email protected] "attr" | 117 | [email protected] |
118 | [email protected] "]" | 118 | [email protected] "|" |
119 | [email protected] | 119 | [email protected] "|" |
120 | [email protected] "|" | 120 | [email protected] |
121 | [email protected] "|" | 121 | [email protected] "{" |
122 | [email protected] | 122 | [email protected] "}" |
123 | [email protected] | 123 | [email protected] ";" |
124 | [email protected] "{" | 124 | [email protected] "\n" |
125 | [email protected] "}" | 125 | [email protected] "}" |
126 | [email protected] ";" | ||
127 | [email protected] "\n" | ||
128 | [email protected] "}" | ||
129 | [email protected] "\n" | 126 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast index 01fffd7b0..8f2f144c7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast | |||
@@ -9,25 +9,23 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "try" |
24 | [email protected] "try" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] | 27 | [email protected] "}" |
28 | [email protected] "{" | 28 | [email protected] ";" |
29 | [email protected] "}" | 29 | [email protected] "\n" |
30 | [email protected] ";" | 30 | [email protected] "}" |
31 | [email protected] "\n" | ||
32 | [email protected] "}" | ||
33 | [email protected] "\n" | 31 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast index 498b3121e..87ac42748 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast | |||
@@ -9,82 +9,81 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "x" |
20 | [email protected] "x" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "box" |
25 | [email protected] "box" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "1i32" |
28 | [email protected] "1i32" | 28 | [email protected] ";" |
29 | [email protected] ";" | 29 | [email protected] "\n " |
30 | [email protected] "\n " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "let" |
32 | [email protected] "let" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "y" |
36 | [email protected] "y" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=" |
38 | [email protected] "=" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "box" |
43 | [email protected] "box" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "1i32" |
46 | [email protected] "1i32" | 46 | [email protected] "," |
47 | [email protected] "," | 47 | [email protected] " " |
48 | [email protected] " " | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "box" |
50 | [email protected] "box" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "2i32" |
53 | [email protected] "2i32" | 53 | [email protected] ")" |
54 | [email protected] ")" | 54 | [email protected] ";" |
55 | [email protected] ";" | 55 | [email protected] "\n " |
56 | [email protected] "\n " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "let" |
58 | [email protected] "let" | 58 | [email protected] " " |
59 | [email protected] " " | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "z" |
62 | [email protected] "z" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] "=" |
64 | [email protected] "=" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "Foo" |
71 | [email protected] "Foo" | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "(" |
73 | [email protected] "(" | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] "box" |
75 | [email protected] "box" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "1i32" |
78 | [email protected] "1i32" | 78 | [email protected] "," |
79 | [email protected] "," | 79 | [email protected] " " |
80 | [email protected] " " | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] "box" |
82 | [email protected] "box" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "2i32" |
85 | [email protected] "2i32" | 85 | [email protected] ")" |
86 | [email protected] ")" | 86 | [email protected] ";" |
87 | [email protected] ";" | 87 | [email protected] "\n" |
88 | [email protected] "\n" | 88 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n" | 89 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast index db58a928e..00ce5ecf0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast | |||
@@ -48,9 +48,8 @@ [email protected] | |||
48 | [email protected] ")" | 48 | [email protected] ")" |
49 | [email protected] " " | 49 | [email protected] " " |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "{" |
52 | [email protected] "{" | 52 | [email protected] "}" |
53 | [email protected] "}" | ||
54 | [email protected] "\n" | 53 | [email protected] "\n" |
55 | [email protected] "}" | 54 | [email protected] "}" |
56 | [email protected] "\n" | 55 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast index 4ca554ef8..b330a0932 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast | |||
@@ -9,56 +9,54 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "enum" |
16 | [email protected] "enum" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "LocalEnum" |
19 | [email protected] "LocalEnum" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "One" |
26 | [email protected] "One" | 26 | [email protected] "," |
27 | [email protected] "," | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "Two" |
31 | [email protected] "Two" | 31 | [email protected] "," |
32 | [email protected] "," | 32 | [email protected] "\n " |
33 | [email protected] "\n " | 33 | [email protected] "}" |
34 | [email protected] "}" | 34 | [email protected] ";" |
35 | [email protected] ";" | 35 | [email protected] "\n " |
36 | [email protected] "\n " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "fn" |
38 | [email protected] "fn" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "f" |
41 | [email protected] "f" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "(" |
43 | [email protected] "(" | 43 | [email protected] ")" |
44 | [email protected] ")" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "{" |
47 | [email protected] | 47 | [email protected] "}" |
48 | [email protected] "{" | 48 | [email protected] ";" |
49 | [email protected] "}" | 49 | [email protected] "\n " |
50 | [email protected] ";" | 50 | [email protected] |
51 | [email protected] "\n " | 51 | [email protected] "struct" |
52 | [email protected] | 52 | [email protected] " " |
53 | [email protected] "struct" | 53 | [email protected] |
54 | [email protected] " " | 54 | [email protected] "S" |
55 | [email protected] | 55 | [email protected] " " |
56 | [email protected] "S" | 56 | [email protected] |
57 | [email protected] " " | 57 | [email protected] "{" |
58 | [email protected] | 58 | [email protected] "}" |
59 | [email protected] "{" | 59 | [email protected] ";" |
60 | [email protected] "}" | 60 | [email protected] "\n" |
61 | [email protected] ";" | 61 | [email protected] "}" |
62 | [email protected] "\n" | ||
63 | [email protected] "}" | ||
64 | [email protected] "\n" | 62 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast index 7fa3b9f32..8e8d9e992 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast | |||
@@ -9,62 +9,61 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "x" |
21 | [email protected] "x" | 21 | [email protected] "." |
22 | [email protected] "." | 22 | [email protected] "await" |
23 | [email protected] "await" | 23 | [email protected] ";" |
24 | [email protected] ";" | 24 | [email protected] "\n " |
25 | [email protected] "\n " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "x" |
33 | [email protected] "x" | 33 | [email protected] "." |
34 | [email protected] "." | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "0" |
36 | [email protected] "0" | 36 | [email protected] "." |
37 | [email protected] "." | 37 | [email protected] "await" |
38 | [email protected] "await" | 38 | [email protected] ";" |
39 | [email protected] ";" | 39 | [email protected] "\n " |
40 | [email protected] "\n " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "x" |
51 | [email protected] "x" | 51 | [email protected] "." |
52 | [email protected] "." | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "0" |
54 | [email protected] "0" | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "(" |
56 | [email protected] "(" | 56 | [email protected] ")" |
57 | [email protected] ")" | 57 | [email protected] "." |
58 | [email protected] "." | 58 | [email protected] "await" |
59 | [email protected] "await" | 59 | [email protected] "?" |
60 | [email protected] "?" | 60 | [email protected] "." |
61 | [email protected] "." | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "hello" |
63 | [email protected] "hello" | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "(" |
65 | [email protected] "(" | 65 | [email protected] ")" |
66 | [email protected] ")" | 66 | [email protected] ";" |
67 | [email protected] ";" | 67 | [email protected] "\n" |
68 | [email protected] "\n" | 68 | [email protected] "}" |
69 | [email protected] "}" | ||
70 | [email protected] "\n" | 69 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast index a32484f2c..c457851c9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast | |||
@@ -50,7 +50,6 @@ [email protected] | |||
50 | [email protected] ")" | 50 | [email protected] ")" |
51 | [email protected] " " | 51 | [email protected] " " |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "{" |
54 | [email protected] "{" | 54 | [email protected] "}" |
55 | [email protected] "}" | ||
56 | [email protected] "\n" | 55 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast index 9017236cc..ea325831e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast | |||
@@ -9,58 +9,56 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "mut" |
19 | [email protected] "mut" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "p" |
22 | [email protected] "p" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] "=" |
24 | [email protected] "=" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "F" |
30 | [email protected] "F" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "{" |
32 | [email protected] "{" | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "x" |
35 | [email protected] "x" | 35 | [email protected] ":" |
36 | [email protected] ":" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "5" |
39 | [email protected] "5" | 39 | [email protected] "}" |
40 | [email protected] "}" | 40 | [email protected] ";" |
41 | [email protected] ";" | 41 | [email protected] "\n " |
42 | [email protected] "\n " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "{" |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] "{" | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "p" |
52 | [email protected] | 52 | [email protected] "}" |
53 | [email protected] "p" | 53 | [email protected] "." |
54 | [email protected] "}" | 54 | [email protected] |
55 | [email protected] "." | 55 | [email protected] "x" |
56 | [email protected] | 56 | [email protected] " " |
57 | [email protected] "x" | 57 | [email protected] "=" |
58 | [email protected] " " | 58 | [email protected] " " |
59 | [email protected] "=" | 59 | [email protected] |
60 | [email protected] " " | 60 | [email protected] "10" |
61 | [email protected] | 61 | [email protected] ";" |
62 | [email protected] "10" | 62 | [email protected] "\n" |
63 | [email protected] ";" | 63 | [email protected] "}" |
64 | [email protected] "\n" | ||
65 | [email protected] "}" | ||
66 | [email protected] "\n" | 64 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast index 2cb5b52f4..9135de9df 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast | |||
@@ -20,7 +20,6 @@ [email protected] | |||
20 | [email protected] ")" | 20 | [email protected] ")" |
21 | [email protected] " " | 21 | [email protected] " " |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "}" |
25 | [email protected] "}" | ||
26 | [email protected] "\n" | 25 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast index ac3f4de26..14610a0a2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast | |||
@@ -29,7 +29,6 @@ [email protected] | |||
29 | [email protected] ")" | 29 | [email protected] ")" |
30 | [email protected] " " | 30 | [email protected] " " |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "{" |
33 | [email protected] "{" | 33 | [email protected] "}" |
34 | [email protected] "}" | ||
35 | [email protected] "\n" | 34 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast index 8d4919cbd..e6be8b7e4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast | |||
@@ -9,34 +9,32 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "for" |
16 | [email protected] "for" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "x" |
20 | [email protected] "x" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "in" |
22 | [email protected] "in" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "0" |
26 | [email protected] "0" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] ".." |
28 | [email protected] ".." | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "{" |
31 | [email protected] | 31 | [email protected] "\n " |
32 | [email protected] "{" | 32 | [email protected] |
33 | [email protected] "\n " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "break" |
35 | [email protected] | 35 | [email protected] ";" |
36 | [email protected] "break" | 36 | [email protected] "\n " |
37 | [email protected] ";" | 37 | [email protected] "}" |
38 | [email protected] "\n " | 38 | [email protected] "\n" |
39 | [email protected] "}" | 39 | [email protected] "}" |
40 | [email protected] "\n" | ||
41 | [email protected] "}" | ||
42 | [email protected] "\n" | 40 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast index 2c933fa76..57fba5fd5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast | |||
@@ -9,103 +9,102 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "box" |
19 | [email protected] "box" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "i" |
23 | [email protected] "i" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] "=" |
25 | [email protected] "=" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "(" |
28 | [email protected] "(" | 28 | [email protected] ")" |
29 | [email protected] ")" | 29 | [email protected] ";" |
30 | [email protected] ";" | 30 | [email protected] "\n " |
31 | [email protected] "\n " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "let" |
33 | [email protected] "let" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "box" |
36 | [email protected] "box" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "Outer" |
42 | [email protected] "Outer" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "{" |
45 | [email protected] "{" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "box" |
49 | [email protected] "box" | 49 | [email protected] " " |
50 | [email protected] " " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "i" |
53 | [email protected] "i" | 53 | [email protected] "," |
54 | [email protected] "," | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "j" |
58 | [email protected] "j" | 58 | [email protected] ":" |
59 | [email protected] ":" | 59 | [email protected] " " |
60 | [email protected] " " | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "box" |
62 | [email protected] "box" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] "Inner" |
68 | [email protected] "Inner" | 68 | [email protected] "(" |
69 | [email protected] "(" | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "box" |
71 | [email protected] "box" | 71 | [email protected] " " |
72 | [email protected] " " | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "&" |
74 | [email protected] "&" | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "x" |
77 | [email protected] "x" | 77 | [email protected] ")" |
78 | [email protected] ")" | 78 | [email protected] " " |
79 | [email protected] " " | 79 | [email protected] "}" |
80 | [email protected] "}" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "=" |
82 | [email protected] "=" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "(" |
85 | [email protected] "(" | 85 | [email protected] ")" |
86 | [email protected] ")" | 86 | [email protected] ";" |
87 | [email protected] ";" | 87 | [email protected] "\n " |
88 | [email protected] "\n " | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "let" |
90 | [email protected] "let" | 90 | [email protected] " " |
91 | [email protected] " " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "box" |
93 | [email protected] "box" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "ref" |
96 | [email protected] "ref" | 96 | [email protected] " " |
97 | [email protected] " " | 97 | [email protected] "mut" |
98 | [email protected] "mut" | 98 | [email protected] " " |
99 | [email protected] " " | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] "i" |
101 | [email protected] "i" | 101 | [email protected] " " |
102 | [email protected] " " | 102 | [email protected] "=" |
103 | [email protected] "=" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] "(" |
106 | [email protected] "(" | 106 | [email protected] ")" |
107 | [email protected] ")" | 107 | [email protected] ";" |
108 | [email protected] ";" | 108 | [email protected] "\n" |
109 | [email protected] "\n" | 109 | [email protected] "}" |
110 | [email protected] "}" | ||
111 | [email protected] "\n" | 110 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast index e0b50d8be..8d8b9597b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast | |||
@@ -9,448 +9,447 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] ".." |
19 | [email protected] ".." | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "(" |
24 | [email protected] "(" | 24 | [email protected] ")" |
25 | [email protected] ")" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] "\n " |
27 | [email protected] "\n " | 27 | [email protected] "//" |
28 | [email protected] "//" | 28 | [email protected] "\n " |
29 | [email protected] "\n " | 29 | [email protected] "// Tuples" |
30 | [email protected] "// Tuples" | 30 | [email protected] "\n " |
31 | [email protected] "\n " | 31 | [email protected] "//" |
32 | [email protected] "//" | 32 | [email protected] "\n " |
33 | [email protected] "\n " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "let" |
35 | [email protected] "let" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "(" |
38 | [email protected] "(" | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "a" |
41 | [email protected] "a" | 41 | [email protected] "," |
42 | [email protected] "," | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] ".." |
45 | [email protected] ".." | 45 | [email protected] ")" |
46 | [email protected] ")" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] "=" |
48 | [email protected] "=" | 48 | [email protected] " " |
49 | [email protected] " " | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "(" |
51 | [email protected] "(" | 51 | [email protected] ")" |
52 | [email protected] ")" | 52 | [email protected] ";" |
53 | [email protected] ";" | 53 | [email protected] "\n " |
54 | [email protected] "\n " | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "let" |
56 | [email protected] "let" | 56 | [email protected] " " |
57 | [email protected] " " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "(" |
59 | [email protected] "(" | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "a" |
62 | [email protected] "a" | 62 | [email protected] "," |
63 | [email protected] "," | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] ".." |
66 | [email protected] ".." | 66 | [email protected] "," |
67 | [email protected] "," | 67 | [email protected] ")" |
68 | [email protected] ")" | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] "=" |
70 | [email protected] "=" | 70 | [email protected] " " |
71 | [email protected] " " | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "(" |
73 | [email protected] "(" | 73 | [email protected] ")" |
74 | [email protected] ")" | 74 | [email protected] ";" |
75 | [email protected] ";" | 75 | [email protected] "\n " |
76 | [email protected] "\n " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "let" |
78 | [email protected] "let" | 78 | [email protected] " " |
79 | [email protected] " " | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "Tuple" |
84 | [email protected] "Tuple" | 84 | [email protected] "(" |
85 | [email protected] "(" | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "a" |
88 | [email protected] "a" | 88 | [email protected] "," |
89 | [email protected] "," | 89 | [email protected] " " |
90 | [email protected] " " | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] ".." |
92 | [email protected] ".." | 92 | [email protected] ")" |
93 | [email protected] ")" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] "=" |
95 | [email protected] "=" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] |
97 | [email protected] | 97 | [email protected] "(" |
98 | [email protected] "(" | 98 | [email protected] ")" |
99 | [email protected] ")" | 99 | [email protected] ";" |
100 | [email protected] ";" | 100 | [email protected] "\n " |
101 | [email protected] "\n " | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] "let" |
103 | [email protected] "let" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "Tuple" |
109 | [email protected] "Tuple" | 109 | [email protected] "(" |
110 | [email protected] "(" | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] "a" |
113 | [email protected] "a" | 113 | [email protected] "," |
114 | [email protected] "," | 114 | [email protected] " " |
115 | [email protected] " " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] ".." |
117 | [email protected] ".." | 117 | [email protected] "," |
118 | [email protected] "," | 118 | [email protected] ")" |
119 | [email protected] ")" | 119 | [email protected] " " |
120 | [email protected] " " | 120 | [email protected] "=" |
121 | [email protected] "=" | 121 | [email protected] " " |
122 | [email protected] " " | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] "(" |
124 | [email protected] "(" | 124 | [email protected] ")" |
125 | [email protected] ")" | 125 | [email protected] ";" |
126 | [email protected] ";" | 126 | [email protected] "\n " |
127 | [email protected] "\n " | 127 | [email protected] |
128 | [email protected] | 128 | [email protected] "let" |
129 | [email protected] "let" | 129 | [email protected] " " |
130 | [email protected] " " | 130 | [email protected] |
131 | [email protected] | 131 | [email protected] "(" |
132 | [email protected] "(" | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] ".." |
134 | [email protected] ".." | 134 | [email protected] "," |
135 | [email protected] "," | 135 | [email protected] " " |
136 | [email protected] " " | 136 | [email protected] |
137 | [email protected] | 137 | [email protected] ".." |
138 | [email protected] ".." | 138 | [email protected] ")" |
139 | [email protected] ")" | 139 | [email protected] " " |
140 | [email protected] " " | 140 | [email protected] "=" |
141 | [email protected] "=" | 141 | [email protected] " " |
142 | [email protected] " " | 142 | [email protected] |
143 | [email protected] | 143 | [email protected] "(" |
144 | [email protected] "(" | 144 | [email protected] ")" |
145 | [email protected] ")" | 145 | [email protected] ";" |
146 | [email protected] ";" | 146 | [email protected] "\n " |
147 | [email protected] "\n " | 147 | [email protected] |
148 | [email protected] | 148 | [email protected] "let" |
149 | [email protected] "let" | 149 | [email protected] " " |
150 | [email protected] " " | 150 | [email protected] |
151 | [email protected] | 151 | [email protected] |
152 | [email protected] | 152 | [email protected] |
153 | [email protected] | 153 | [email protected] |
154 | [email protected] | 154 | [email protected] "Tuple" |
155 | [email protected] "Tuple" | 155 | [email protected] "(" |
156 | [email protected] "(" | 156 | [email protected] |
157 | [email protected] | 157 | [email protected] ".." |
158 | [email protected] ".." | 158 | [email protected] "," |
159 | [email protected] "," | 159 | [email protected] " " |
160 | [email protected] " " | 160 | [email protected] |
161 | [email protected] | 161 | [email protected] ".." |
162 | [email protected] ".." | 162 | [email protected] ")" |
163 | [email protected] ")" | 163 | [email protected] " " |
164 | [email protected] " " | 164 | [email protected] "=" |
165 | [email protected] "=" | 165 | [email protected] " " |
166 | [email protected] " " | 166 | [email protected] |
167 | [email protected] | 167 | [email protected] "(" |
168 | [email protected] "(" | 168 | [email protected] ")" |
169 | [email protected] ")" | 169 | [email protected] ";" |
170 | [email protected] ";" | 170 | [email protected] "\n " |
171 | [email protected] "\n " | 171 | [email protected] |
172 | [email protected] | 172 | [email protected] "let" |
173 | [email protected] "let" | 173 | [email protected] " " |
174 | [email protected] " " | 174 | [email protected] |
175 | [email protected] | 175 | [email protected] "(" |
176 | [email protected] "(" | 176 | [email protected] |
177 | [email protected] | 177 | [email protected] ".." |
178 | [email protected] ".." | 178 | [email protected] "," |
179 | [email protected] "," | 179 | [email protected] " " |
180 | [email protected] " " | 180 | [email protected] |
181 | [email protected] | 181 | [email protected] |
182 | [email protected] | 182 | [email protected] "a" |
183 | [email protected] "a" | 183 | [email protected] "," |
184 | [email protected] "," | 184 | [email protected] " " |
185 | [email protected] " " | 185 | [email protected] |
186 | [email protected] | 186 | [email protected] ".." |
187 | [email protected] ".." | 187 | [email protected] ")" |
188 | [email protected] ")" | 188 | [email protected] " " |
189 | [email protected] " " | 189 | [email protected] "=" |
190 | [email protected] "=" | 190 | [email protected] " " |
191 | [email protected] " " | 191 | [email protected] |
192 | [email protected] | 192 | [email protected] "(" |
193 | [email protected] "(" | 193 | [email protected] ")" |
194 | [email protected] ")" | 194 | [email protected] ";" |
195 | [email protected] ";" | 195 | [email protected] "\n " |
196 | [email protected] "\n " | 196 | [email protected] |
197 | [email protected] | 197 | [email protected] "let" |
198 | [email protected] "let" | 198 | [email protected] " " |
199 | [email protected] " " | 199 | [email protected] |
200 | [email protected] | 200 | [email protected] |
201 | [email protected] | 201 | [email protected] |
202 | [email protected] | 202 | [email protected] |
203 | [email protected] | 203 | [email protected] "Tuple" |
204 | [email protected] "Tuple" | 204 | [email protected] "(" |
205 | [email protected] "(" | 205 | [email protected] |
206 | [email protected] | 206 | [email protected] ".." |
207 | [email protected] ".." | 207 | [email protected] "," |
208 | [email protected] "," | 208 | [email protected] " " |
209 | [email protected] " " | 209 | [email protected] |
210 | [email protected] | 210 | [email protected] |
211 | [email protected] | 211 | [email protected] "a" |
212 | [email protected] "a" | 212 | [email protected] "," |
213 | [email protected] "," | 213 | [email protected] " " |
214 | [email protected] " " | 214 | [email protected] |
215 | [email protected] | 215 | [email protected] ".." |
216 | [email protected] ".." | 216 | [email protected] ")" |
217 | [email protected] ")" | 217 | [email protected] " " |
218 | [email protected] " " | 218 | [email protected] "=" |
219 | [email protected] "=" | 219 | [email protected] " " |
220 | [email protected] " " | 220 | [email protected] |
221 | [email protected] | 221 | [email protected] "(" |
222 | [email protected] "(" | 222 | [email protected] ")" |
223 | [email protected] ")" | 223 | [email protected] ";" |
224 | [email protected] ";" | 224 | [email protected] "\n " |
225 | [email protected] "\n " | 225 | [email protected] "//" |
226 | [email protected] "//" | 226 | [email protected] "\n " |
227 | [email protected] "\n " | 227 | [email protected] "// Slices" |
228 | [email protected] "// Slices" | 228 | [email protected] "\n " |
229 | [email protected] "\n " | 229 | [email protected] "//" |
230 | [email protected] "//" | 230 | [email protected] "\n " |
231 | [email protected] "\n " | 231 | [email protected] |
232 | [email protected] | 232 | [email protected] "let" |
233 | [email protected] "let" | 233 | [email protected] " " |
234 | [email protected] " " | 234 | [email protected] |
235 | [email protected] | 235 | [email protected] "[" |
236 | [email protected] "[" | 236 | [email protected] |
237 | [email protected] | 237 | [email protected] ".." |
238 | [email protected] ".." | 238 | [email protected] "]" |
239 | [email protected] "]" | 239 | [email protected] " " |
240 | [email protected] " " | 240 | [email protected] "=" |
241 | [email protected] "=" | 241 | [email protected] " " |
242 | [email protected] " " | 242 | [email protected] |
243 | [email protected] | 243 | [email protected] "(" |
244 | [email protected] "(" | 244 | [email protected] ")" |
245 | [email protected] ")" | 245 | [email protected] ";" |
246 | [email protected] ";" | 246 | [email protected] "\n " |
247 | [email protected] "\n " | 247 | [email protected] |
248 | [email protected] | 248 | [email protected] "let" |
249 | [email protected] "let" | 249 | [email protected] " " |
250 | [email protected] " " | 250 | [email protected] |
251 | [email protected] | 251 | [email protected] "[" |
252 | [email protected] "[" | 252 | [email protected] |
253 | [email protected] | 253 | [email protected] |
254 | [email protected] | 254 | [email protected] "head" |
255 | [email protected] "head" | 255 | [email protected] "," |
256 | [email protected] "," | 256 | [email protected] " " |
257 | [email protected] " " | 257 | [email protected] |
258 | [email protected] | 258 | [email protected] ".." |
259 | [email protected] ".." | 259 | [email protected] "]" |
260 | [email protected] "]" | 260 | [email protected] " " |
261 | [email protected] " " | 261 | [email protected] "=" |
262 | [email protected] "=" | 262 | [email protected] " " |
263 | [email protected] " " | 263 | [email protected] |
264 | [email protected] | 264 | [email protected] "(" |
265 | [email protected] "(" | 265 | [email protected] ")" |
266 | [email protected] ")" | 266 | [email protected] ";" |
267 | [email protected] ";" | 267 | [email protected] "\n " |
268 | [email protected] "\n " | 268 | [email protected] |
269 | [email protected] | 269 | [email protected] "let" |
270 | [email protected] "let" | 270 | [email protected] " " |
271 | [email protected] " " | 271 | [email protected] |
272 | [email protected] | 272 | [email protected] "[" |
273 | [email protected] "[" | 273 | [email protected] |
274 | [email protected] | 274 | [email protected] |
275 | [email protected] | 275 | [email protected] "head" |
276 | [email protected] "head" | 276 | [email protected] "," |
277 | [email protected] "," | 277 | [email protected] " " |
278 | [email protected] " " | 278 | [email protected] |
279 | [email protected] | 279 | [email protected] |
280 | [email protected] | 280 | [email protected] "tail" |
281 | [email protected] "tail" | 281 | [email protected] " " |
282 | [email protected] " " | 282 | [email protected] "@" |
283 | [email protected] "@" | 283 | [email protected] " " |
284 | [email protected] " " | 284 | [email protected] |
285 | [email protected] | 285 | [email protected] ".." |
286 | [email protected] ".." | 286 | [email protected] "]" |
287 | [email protected] "]" | 287 | [email protected] " " |
288 | [email protected] " " | 288 | [email protected] "=" |
289 | [email protected] "=" | 289 | [email protected] " " |
290 | [email protected] " " | 290 | [email protected] |
291 | [email protected] | 291 | [email protected] "(" |
292 | [email protected] "(" | 292 | [email protected] ")" |
293 | [email protected] ")" | 293 | [email protected] ";" |
294 | [email protected] ";" | 294 | [email protected] "\n " |
295 | [email protected] "\n " | 295 | [email protected] |
296 | [email protected] | 296 | [email protected] "let" |
297 | [email protected] "let" | 297 | [email protected] " " |
298 | [email protected] " " | 298 | [email protected] |
299 | [email protected] | 299 | [email protected] "[" |
300 | [email protected] "[" | 300 | [email protected] |
301 | [email protected] | 301 | [email protected] |
302 | [email protected] | 302 | [email protected] "head" |
303 | [email protected] "head" | 303 | [email protected] "," |
304 | [email protected] "," | 304 | [email protected] " " |
305 | [email protected] " " | 305 | [email protected] |
306 | [email protected] | 306 | [email protected] ".." |
307 | [email protected] ".." | 307 | [email protected] "," |
308 | [email protected] "," | 308 | [email protected] " " |
309 | [email protected] " " | 309 | [email protected] |
310 | [email protected] | 310 | [email protected] |
311 | [email protected] | 311 | [email protected] "cons" |
312 | [email protected] "cons" | 312 | [email protected] "]" |
313 | [email protected] "]" | 313 | [email protected] " " |
314 | [email protected] " " | 314 | [email protected] "=" |
315 | [email protected] "=" | 315 | [email protected] " " |
316 | [email protected] " " | 316 | [email protected] |
317 | [email protected] | 317 | [email protected] "(" |
318 | [email protected] "(" | 318 | [email protected] ")" |
319 | [email protected] ")" | 319 | [email protected] ";" |
320 | [email protected] ";" | 320 | [email protected] "\n " |
321 | [email protected] "\n " | 321 | [email protected] |
322 | [email protected] | 322 | [email protected] "let" |
323 | [email protected] "let" | 323 | [email protected] " " |
324 | [email protected] " " | 324 | [email protected] |
325 | [email protected] | 325 | [email protected] "[" |
326 | [email protected] "[" | 326 | [email protected] |
327 | [email protected] | 327 | [email protected] |
328 | [email protected] | 328 | [email protected] "head" |
329 | [email protected] "head" | 329 | [email protected] "," |
330 | [email protected] "," | 330 | [email protected] " " |
331 | [email protected] " " | 331 | [email protected] |
332 | [email protected] | 332 | [email protected] |
333 | [email protected] | 333 | [email protected] "mid" |
334 | [email protected] "mid" | 334 | [email protected] " " |
335 | [email protected] " " | 335 | [email protected] "@" |
336 | [email protected] "@" | 336 | [email protected] " " |
337 | [email protected] " " | 337 | [email protected] |
338 | [email protected] | 338 | [email protected] ".." |
339 | [email protected] ".." | 339 | [email protected] "," |
340 | [email protected] "," | 340 | [email protected] " " |
341 | [email protected] " " | 341 | [email protected] |
342 | [email protected] | 342 | [email protected] |
343 | [email protected] | 343 | [email protected] "cons" |
344 | [email protected] "cons" | 344 | [email protected] "]" |
345 | [email protected] "]" | 345 | [email protected] " " |
346 | [email protected] " " | 346 | [email protected] "=" |
347 | [email protected] "=" | 347 | [email protected] " " |
348 | [email protected] " " | 348 | [email protected] |
349 | [email protected] | 349 | [email protected] "(" |
350 | [email protected] "(" | 350 | [email protected] ")" |
351 | [email protected] ")" | 351 | [email protected] ";" |
352 | [email protected] ";" | 352 | [email protected] "\n " |
353 | [email protected] "\n " | 353 | [email protected] |
354 | [email protected] | 354 | [email protected] "let" |
355 | [email protected] "let" | 355 | [email protected] " " |
356 | [email protected] " " | 356 | [email protected] |
357 | [email protected] | 357 | [email protected] "[" |
358 | [email protected] "[" | 358 | [email protected] |
359 | [email protected] | 359 | [email protected] |
360 | [email protected] | 360 | [email protected] "head" |
361 | [email protected] "head" | 361 | [email protected] "," |
362 | [email protected] "," | 362 | [email protected] " " |
363 | [email protected] " " | 363 | [email protected] |
364 | [email protected] | 364 | [email protected] ".." |
365 | [email protected] ".." | 365 | [email protected] "," |
366 | [email protected] "," | 366 | [email protected] " " |
367 | [email protected] " " | 367 | [email protected] |
368 | [email protected] | 368 | [email protected] ".." |
369 | [email protected] ".." | 369 | [email protected] "," |
370 | [email protected] "," | 370 | [email protected] " " |
371 | [email protected] " " | 371 | [email protected] |
372 | [email protected] | 372 | [email protected] |
373 | [email protected] | 373 | [email protected] "cons" |
374 | [email protected] "cons" | 374 | [email protected] "]" |
375 | [email protected] "]" | 375 | [email protected] " " |
376 | [email protected] " " | 376 | [email protected] "=" |
377 | [email protected] "=" | 377 | [email protected] " " |
378 | [email protected] " " | 378 | [email protected] |
379 | [email protected] | 379 | [email protected] "(" |
380 | [email protected] "(" | 380 | [email protected] ")" |
381 | [email protected] ")" | 381 | [email protected] ";" |
382 | [email protected] ";" | 382 | [email protected] "\n " |
383 | [email protected] "\n " | 383 | [email protected] |
384 | [email protected] | 384 | [email protected] "let" |
385 | [email protected] "let" | 385 | [email protected] " " |
386 | [email protected] " " | 386 | [email protected] |
387 | [email protected] | 387 | [email protected] "[" |
388 | [email protected] "[" | 388 | [email protected] |
389 | [email protected] | 389 | [email protected] |
390 | [email protected] | 390 | [email protected] "head" |
391 | [email protected] "head" | 391 | [email protected] "," |
392 | [email protected] "," | 392 | [email protected] " " |
393 | [email protected] " " | 393 | [email protected] |
394 | [email protected] | 394 | [email protected] ".." |
395 | [email protected] ".." | 395 | [email protected] "," |
396 | [email protected] "," | 396 | [email protected] " " |
397 | [email protected] " " | 397 | [email protected] |
398 | [email protected] | 398 | [email protected] |
399 | [email protected] | 399 | [email protected] "mid" |
400 | [email protected] "mid" | 400 | [email protected] "," |
401 | [email protected] "," | 401 | [email protected] " " |
402 | [email protected] " " | 402 | [email protected] |
403 | [email protected] | 403 | [email protected] |
404 | [email protected] | 404 | [email protected] "tail" |
405 | [email protected] "tail" | 405 | [email protected] " " |
406 | [email protected] " " | 406 | [email protected] "@" |
407 | [email protected] "@" | 407 | [email protected] " " |
408 | [email protected] " " | 408 | [email protected] |
409 | [email protected] | 409 | [email protected] ".." |
410 | [email protected] ".." | 410 | [email protected] "]" |
411 | [email protected] "]" | 411 | [email protected] " " |
412 | [email protected] " " | 412 | [email protected] "=" |
413 | [email protected] "=" | 413 | [email protected] " " |
414 | [email protected] " " | 414 | [email protected] |
415 | [email protected] | 415 | [email protected] "(" |
416 | [email protected] "(" | 416 | [email protected] ")" |
417 | [email protected] ")" | 417 | [email protected] ";" |
418 | [email protected] ";" | 418 | [email protected] "\n " |
419 | [email protected] "\n " | 419 | [email protected] |
420 | [email protected] | 420 | [email protected] "let" |
421 | [email protected] "let" | 421 | [email protected] " " |
422 | [email protected] " " | 422 | [email protected] |
423 | [email protected] | 423 | [email protected] "[" |
424 | [email protected] "[" | 424 | [email protected] |
425 | [email protected] | 425 | [email protected] |
426 | [email protected] | 426 | [email protected] "head" |
427 | [email protected] "head" | 427 | [email protected] "," |
428 | [email protected] "," | 428 | [email protected] " " |
429 | [email protected] " " | 429 | [email protected] |
430 | [email protected] | 430 | [email protected] ".." |
431 | [email protected] ".." | 431 | [email protected] "," |
432 | [email protected] "," | 432 | [email protected] " " |
433 | [email protected] " " | 433 | [email protected] |
434 | [email protected] | 434 | [email protected] |
435 | [email protected] | 435 | [email protected] "mid" |
436 | [email protected] "mid" | 436 | [email protected] "," |
437 | [email protected] "," | 437 | [email protected] " " |
438 | [email protected] " " | 438 | [email protected] |
439 | [email protected] | 439 | [email protected] ".." |
440 | [email protected] ".." | 440 | [email protected] "," |
441 | [email protected] "," | 441 | [email protected] " " |
442 | [email protected] " " | 442 | [email protected] |
443 | [email protected] | 443 | [email protected] |
444 | [email protected] | 444 | [email protected] "cons" |
445 | [email protected] "cons" | 445 | [email protected] "]" |
446 | [email protected] "]" | 446 | [email protected] " " |
447 | [email protected] " " | 447 | [email protected] "=" |
448 | [email protected] "=" | 448 | [email protected] " " |
449 | [email protected] " " | 449 | [email protected] |
450 | [email protected] | 450 | [email protected] "(" |
451 | [email protected] "(" | 451 | [email protected] ")" |
452 | [email protected] ")" | 452 | [email protected] ";" |
453 | [email protected] ";" | 453 | [email protected] "\n" |
454 | [email protected] "\n" | 454 | [email protected] "}" |
455 | [email protected] "}" | ||
456 | [email protected] "\n" | 455 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast index 10434b637..7c092d518 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast | |||
@@ -9,68 +9,67 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "S" |
22 | [email protected] "S" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "{" |
25 | [email protected] "{" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "0" |
29 | [email protected] "0" | 29 | [email protected] ":" |
30 | [email protected] ":" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "1" |
34 | [email protected] "1" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] "}" |
36 | [email protected] "}" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=" |
38 | [email protected] "=" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] ")" |
42 | [email protected] ")" | 42 | [email protected] ";" |
43 | [email protected] ";" | 43 | [email protected] "\n " |
44 | [email protected] "\n " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "let" |
46 | [email protected] "let" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "S" |
52 | [email protected] "S" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "{" |
55 | [email protected] "{" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "x" |
59 | [email protected] "x" | 59 | [email protected] ":" |
60 | [email protected] ":" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "1" |
64 | [email protected] "1" | 64 | [email protected] " " |
65 | [email protected] " " | 65 | [email protected] "}" |
66 | [email protected] "}" | 66 | [email protected] " " |
67 | [email protected] " " | 67 | [email protected] "=" |
68 | [email protected] "=" | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "(" |
71 | [email protected] "(" | 71 | [email protected] ")" |
72 | [email protected] ")" | 72 | [email protected] ";" |
73 | [email protected] ";" | 73 | [email protected] "\n" |
74 | [email protected] "\n" | 74 | [email protected] "}" |
75 | [email protected] "}" | ||
76 | [email protected] "\n" | 75 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast index 66ad546b9..8382a4f96 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast | |||
@@ -9,35 +9,34 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "&" |
25 | [email protected] "&" | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "1" |
27 | [email protected] "1" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "as" |
29 | [email protected] "as" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "*" |
32 | [email protected] "*" | 32 | [email protected] "const" |
33 | [email protected] "const" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "i32" |
39 | [email protected] "i32" | 39 | [email protected] ";" |
40 | [email protected] ";" | 40 | [email protected] "\n" |
41 | [email protected] "\n" | 41 | [email protected] "}" |
42 | [email protected] "}" | ||
43 | [email protected] "\n" | 42 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast index c2e290a62..f43dfbe63 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast | |||
@@ -9,29 +9,28 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "foo" |
20 | [email protected] "foo" | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "(" |
22 | [email protected] "(" | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "#" |
25 | [email protected] "#" | 25 | [email protected] "[" |
26 | [email protected] "[" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "attr" |
30 | [email protected] "attr" | 30 | [email protected] "]" |
31 | [email protected] "]" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] "92" |
33 | [email protected] "92" | 33 | [email protected] ")" |
34 | [email protected] ")" | 34 | [email protected] "\n" |
35 | [email protected] "\n" | 35 | [email protected] "}" |
36 | [email protected] "}" | ||
37 | [email protected] "\n" | 36 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast index dad3dfe4d..ecac05950 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast | |||
@@ -9,62 +9,61 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "foo" |
20 | [email protected] "foo" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "|" |
26 | [email protected] "|" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "bar" |
30 | [email protected] "bar" | 30 | [email protected] "," |
31 | [email protected] "," | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "baz" |
36 | [email protected] "baz" | 36 | [email protected] ":" |
37 | [email protected] ":" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "Baz" |
43 | [email protected] "Baz" | 43 | [email protected] "," |
44 | [email protected] "," | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "qux" |
49 | [email protected] "qux" | 49 | [email protected] ":" |
50 | [email protected] ":" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "Qux" |
57 | [email protected] "Qux" | 57 | [email protected] "::" |
58 | [email protected] "::" | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "Quux" |
61 | [email protected] "Quux" | 61 | [email protected] "|" |
62 | [email protected] "|" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "(" |
65 | [email protected] "(" | 65 | [email protected] ")" |
66 | [email protected] ")" | 66 | [email protected] ";" |
67 | [email protected] ";" | 67 | [email protected] "\n" |
68 | [email protected] "\n" | 68 | [email protected] "}" |
69 | [email protected] "}" | ||
70 | [email protected] "\n" | 69 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast index 3110bf5c0..092833417 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast | |||
@@ -38,7 +38,6 @@ [email protected] | |||
38 | [email protected] ")" | 38 | [email protected] ")" |
39 | [email protected] " " | 39 | [email protected] " " |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "{" |
42 | [email protected] "{" | 42 | [email protected] "}" |
43 | [email protected] "}" | ||
44 | [email protected] "\n" | 43 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast index 3f3e6a9a2..88d512f1a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast | |||
@@ -9,104 +9,103 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "(" |
19 | [email protected] "(" | 19 | [email protected] ")" |
20 | [email protected] ")" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "{" |
23 | [email protected] "{" | 23 | [email protected] "\n " |
24 | [email protected] "\n " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "(" |
27 | [email protected] "(" | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "_" |
30 | [email protected] "_" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] "|" |
32 | [email protected] "|" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "_" |
35 | [email protected] "_" | 35 | [email protected] ")" |
36 | [email protected] ")" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=>" |
38 | [email protected] "=>" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "(" |
41 | [email protected] "(" | 41 | [email protected] ")" |
42 | [email protected] ")" | 42 | [email protected] "," |
43 | [email protected] "," | 43 | [email protected] "\n " |
44 | [email protected] "\n " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "&" |
47 | [email protected] "&" | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "_" |
52 | [email protected] "_" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] "|" |
54 | [email protected] "|" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "_" |
57 | [email protected] "_" | 57 | [email protected] ")" |
58 | [email protected] ")" | 58 | [email protected] " " |
59 | [email protected] " " | 59 | [email protected] "=>" |
60 | [email protected] "=>" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] "(" |
63 | [email protected] "(" | 63 | [email protected] ")" |
64 | [email protected] ")" | 64 | [email protected] "," |
65 | [email protected] "," | 65 | [email protected] "\n " |
66 | [email protected] "\n " | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] "(" |
69 | [email protected] "(" | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "_" |
72 | [email protected] "_" | 72 | [email protected] " " |
73 | [email protected] " " | 73 | [email protected] "|" |
74 | [email protected] "|" | 74 | [email protected] " " |
75 | [email protected] " " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "_" |
77 | [email protected] "_" | 77 | [email protected] "," |
78 | [email protected] "," | 78 | [email protected] ")" |
79 | [email protected] ")" | 79 | [email protected] " " |
80 | [email protected] " " | 80 | [email protected] "=>" |
81 | [email protected] "=>" | 81 | [email protected] " " |
82 | [email protected] " " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "(" |
84 | [email protected] "(" | 84 | [email protected] ")" |
85 | [email protected] ")" | 85 | [email protected] "," |
86 | [email protected] "," | 86 | [email protected] "\n " |
87 | [email protected] "\n " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "[" |
90 | [email protected] "[" | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "_" |
93 | [email protected] "_" | 93 | [email protected] " " |
94 | [email protected] " " | 94 | [email protected] "|" |
95 | [email protected] "|" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] |
97 | [email protected] | 97 | [email protected] "_" |
98 | [email protected] "_" | 98 | [email protected] "," |
99 | [email protected] "," | 99 | [email protected] "]" |
100 | [email protected] "]" | 100 | [email protected] " " |
101 | [email protected] " " | 101 | [email protected] "=>" |
102 | [email protected] "=>" | 102 | [email protected] " " |
103 | [email protected] " " | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "(" |
105 | [email protected] "(" | 105 | [email protected] ")" |
106 | [email protected] ")" | 106 | [email protected] "," |
107 | [email protected] "," | 107 | [email protected] "\n " |
108 | [email protected] "\n " | 108 | [email protected] "}" |
109 | [email protected] "}" | 109 | [email protected] "\n" |
110 | [email protected] "\n" | 110 | [email protected] "}" |
111 | [email protected] "}" | ||
112 | [email protected] "\n" | 111 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast index 50db9e967..bd9e8d40f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast | |||
@@ -9,30 +9,28 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "v" |
21 | [email protected] "v" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] "=" |
23 | [email protected] "=" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] "{" | 28 | [email protected] "1" |
29 | [email protected] | 29 | [email protected] "}" |
30 | [email protected] "1" | 30 | [email protected] "&" |
31 | [email protected] "}" | 31 | [email protected] |
32 | [email protected] "&" | 32 | [email protected] "2" |
33 | [email protected] | 33 | [email protected] ";" |
34 | [email protected] "2" | 34 | [email protected] "\n" |
35 | [email protected] ";" | 35 | [email protected] "}" |
36 | [email protected] "\n" | ||
37 | [email protected] "}" | ||
38 | [email protected] "\n" | 36 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast index c05e05bf3..08333a325 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast | |||
@@ -9,37 +9,35 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "|" |
19 | [email protected] "|" | 19 | [email protected] "|" |
20 | [email protected] "|" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "->" |
23 | [email protected] "->" | 23 | [email protected] " " |
24 | [email protected] " " | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "i32" |
29 | [email protected] "i32" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "{" |
32 | [email protected] | 32 | [email protected] " " |
33 | [email protected] "{" | 33 | [email protected] |
34 | [email protected] " " | 34 | [email protected] "92" |
35 | [email protected] | 35 | [email protected] " " |
36 | [email protected] "92" | 36 | [email protected] "}" |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] "}" | 38 | [email protected] "(" |
39 | [email protected] | 39 | [email protected] ")" |
40 | [email protected] "(" | 40 | [email protected] ";" |
41 | [email protected] ")" | 41 | [email protected] " " |
42 | [email protected] ";" | 42 | [email protected] "}" |
43 | [email protected] " " | ||
44 | [email protected] "}" | ||
45 | [email protected] "\n" | 43 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast index beb6d8010..5f09e4f4a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast | |||
@@ -9,27 +9,26 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "try" |
20 | [email protected] "try" | 20 | [email protected] "!" |
21 | [email protected] "!" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] "Ok" |
24 | [email protected] "Ok" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "(" |
26 | [email protected] "(" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "(" |
28 | [email protected] "(" | 28 | [email protected] ")" |
29 | [email protected] ")" | 29 | [email protected] ")" |
30 | [email protected] ")" | 30 | [email protected] ")" |
31 | [email protected] ")" | 31 | [email protected] ";" |
32 | [email protected] ";" | 32 | [email protected] " " |
33 | [email protected] " " | 33 | [email protected] "}" |
34 | [email protected] "}" | ||
35 | [email protected] "\n" | 34 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast new file mode 100644 index 000000000..9efebd8b8 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast | |||
@@ -0,0 +1,26 @@ | |||
1 | [email protected] | ||
2 | [email protected] | ||
3 | [email protected] "fn" | ||
4 | [email protected] " " | ||
5 | [email protected] | ||
6 | [email protected] "f" | ||
7 | [email protected] | ||
8 | [email protected] "(" | ||
9 | [email protected] ")" | ||
10 | [email protected] " " | ||
11 | [email protected] | ||
12 | [email protected] "{" | ||
13 | [email protected] " " | ||
14 | [email protected] | ||
15 | [email protected] | ||
16 | [email protected] | ||
17 | [email protected] "\'label" | ||
18 | [email protected] ":" | ||
19 | [email protected] " " | ||
20 | [email protected] | ||
21 | [email protected] "{" | ||
22 | [email protected] "}" | ||
23 | [email protected] ";" | ||
24 | [email protected] " " | ||
25 | [email protected] "}" | ||
26 | [email protected] "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs new file mode 100644 index 000000000..18b4ff4b1 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs | |||
@@ -0,0 +1 @@ | |||
fn f() { 'label: {}; } | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast new file mode 100644 index 000000000..4991f2c36 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast | |||
@@ -0,0 +1,23 @@ | |||
1 | [email protected] | ||
2 | [email protected] | ||
3 | [email protected] "fn" | ||
4 | [email protected] " " | ||
5 | [email protected] | ||
6 | [email protected] "f" | ||
7 | [email protected] | ||
8 | [email protected] "(" | ||
9 | [email protected] ")" | ||
10 | [email protected] " " | ||
11 | [email protected] | ||
12 | [email protected] "{" | ||
13 | [email protected] " " | ||
14 | [email protected] | ||
15 | [email protected] "unsafe" | ||
16 | [email protected] " " | ||
17 | [email protected] | ||
18 | [email protected] "{" | ||
19 | [email protected] " " | ||
20 | [email protected] "}" | ||
21 | [email protected] " " | ||
22 | [email protected] "}" | ||
23 | [email protected] "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs new file mode 100644 index 000000000..dfb9b2a1c --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs | |||
@@ -0,0 +1 @@ | |||
fn f() { unsafe { } } | |||
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast index 993ba72b6..0ec237f8e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast | |||
@@ -9,8 +9,7 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n" |
14 | [email protected] "\n" | 14 | [email protected] "}" |
15 | [email protected] "}" | ||
16 | [email protected] "\n" | 15 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast index 353bf2d2e..37b452ec4 100644 --- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast | |||
@@ -36,10 +36,9 @@ [email protected] | |||
36 | [email protected] ")" | 36 | [email protected] ")" |
37 | [email protected] " " | 37 | [email protected] " " |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "{" |
40 | [email protected] "{" | 40 | [email protected] "\n " |
41 | [email protected] "\n " | 41 | [email protected] "}" |
42 | [email protected] "}" | ||
43 | [email protected] "\n " | 42 | [email protected] "\n " |
44 | [email protected] | 43 | [email protected] |
45 | [email protected] "struct" | 44 | [email protected] "struct" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast index 3919cc78b..0b9bc58e8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast +++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast | |||
@@ -31,9 +31,8 @@ [email protected] | |||
31 | [email protected] ")" | 31 | [email protected] ")" |
32 | [email protected] " " | 32 | [email protected] " " |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "{" |
35 | [email protected] "{" | 35 | [email protected] "}" |
36 | [email protected] "}" | ||
37 | [email protected] "\n\n" | 36 | [email protected] "\n\n" |
38 | [email protected] | 37 | [email protected] |
39 | [email protected] | 38 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast index 750a045ef..980b34049 100644 --- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast +++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast | |||
@@ -9,9 +9,8 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "}" |
14 | [email protected] "}" | ||
15 | [email protected] "\n" | 14 | [email protected] "\n" |
16 | [email protected] | 15 | [email protected] |
17 | [email protected] | 16 | [email protected] |
@@ -26,9 +25,8 @@ [email protected] | |||
26 | [email protected] ")" | 25 | [email protected] ")" |
27 | [email protected] " " | 26 | [email protected] " " |
28 | [email protected] | 27 | [email protected] |
29 | [email protected] | 28 | [email protected] "{" |
30 | [email protected] "{" | 29 | [email protected] "}" |
31 | [email protected] "}" | ||
32 | [email protected] "\n" | 30 | [email protected] "\n" |
33 | [email protected] | 31 | [email protected] |
34 | [email protected] | 32 | [email protected] |
@@ -46,9 +44,8 @@ [email protected] | |||
46 | [email protected] ")" | 44 | [email protected] ")" |
47 | [email protected] " " | 45 | [email protected] " " |
48 | [email protected] | 46 | [email protected] |
49 | [email protected] | 47 | [email protected] "{" |
50 | [email protected] "{" | 48 | [email protected] "}" |
51 | [email protected] "}" | ||
52 | [email protected] "\n" | 49 | [email protected] "\n" |
53 | [email protected] | 50 | [email protected] |
54 | [email protected] | 51 | [email protected] |
@@ -66,9 +63,8 @@ [email protected] | |||
66 | [email protected] ")" | 63 | [email protected] ")" |
67 | [email protected] " " | 64 | [email protected] " " |
68 | [email protected] | 65 | [email protected] |
69 | [email protected] | 66 | [email protected] "{" |
70 | [email protected] "{" | 67 | [email protected] "}" |
71 | [email protected] "}" | ||
72 | [email protected] "\n" | 68 | [email protected] "\n" |
73 | [email protected] | 69 | [email protected] |
74 | [email protected] | 70 | [email protected] |
@@ -101,7 +97,6 @@ [email protected] | |||
101 | [email protected] ")" | 97 | [email protected] ")" |
102 | [email protected] " " | 98 | [email protected] " " |
103 | [email protected] | 99 | [email protected] |
104 | [email protected] | 100 | [email protected] "{" |
105 | [email protected] "{" | 101 | [email protected] "}" |
106 | [email protected] "}" | ||
107 | [email protected] "\n" | 102 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast index b5747aacd..964cbf5dd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast +++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast | |||
@@ -23,7 +23,6 @@ [email protected] | |||
23 | [email protected] ")" | 23 | [email protected] ")" |
24 | [email protected] " " | 24 | [email protected] " " |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] "{" | 27 | [email protected] "}" |
28 | [email protected] "}" | ||
29 | [email protected] "\n" | 28 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast index 643a1d16c..873791f50 100644 --- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast | |||
@@ -12,10 +12,9 @@ [email protected] | |||
12 | [email protected] ")" | 12 | [email protected] ")" |
13 | [email protected] " " | 13 | [email protected] " " |
14 | [email protected] | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "{" |
16 | [email protected] "{" | 16 | [email protected] "\n" |
17 | [email protected] "\n" | 17 | [email protected] "}" |
18 | [email protected] "}" | ||
19 | [email protected] "\n\n" | 18 | [email protected] "\n\n" |
20 | [email protected] | 19 | [email protected] |
21 | [email protected] | 20 | [email protected] |
@@ -32,10 +31,9 @@ [email protected] | |||
32 | [email protected] ")" | 31 | [email protected] ")" |
33 | [email protected] " " | 32 | [email protected] " " |
34 | [email protected] | 33 | [email protected] |
35 | [email protected] | 34 | [email protected] "{" |
36 | [email protected] "{" | 35 | [email protected] "\n" |
37 | [email protected] "\n" | 36 | [email protected] "}" |
38 | [email protected] "}" | ||
39 | [email protected] "\n\n" | 37 | [email protected] "\n\n" |
40 | [email protected] | 38 | [email protected] |
41 | [email protected] | 39 | [email protected] |
@@ -52,8 +50,7 @@ [email protected] | |||
52 | [email protected] ")" | 50 | [email protected] ")" |
53 | [email protected] " " | 51 | [email protected] " " |
54 | [email protected] | 52 | [email protected] |
55 | [email protected] | 53 | [email protected] "{" |
56 | [email protected] "{" | 54 | [email protected] "\n" |
57 | [email protected] "\n" | 55 | [email protected] "}" |
58 | [email protected] "}" | ||
59 | [email protected] "\n" | 56 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast index 60af55837..5701f566e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast | |||
@@ -9,25 +9,23 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "extern" |
17 | [email protected] "extern" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] "fn" |
19 | [email protected] "fn" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "f" |
22 | [email protected] "f" | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "(" |
24 | [email protected] "(" | 24 | [email protected] ")" |
25 | [email protected] ")" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "{" |
28 | [email protected] | 28 | [email protected] "}" |
29 | [email protected] "{" | 29 | [email protected] "\n" |
30 | [email protected] "}" | 30 | [email protected] "}" |
31 | [email protected] "\n" | ||
32 | [email protected] "}" | ||
33 | [email protected] "\n" | 31 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast index 4432c0163..b029d8692 100644 --- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast | |||
@@ -9,24 +9,22 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "const" |
16 | [email protected] "const" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] "fn" |
18 | [email protected] "fn" | 18 | [email protected] " " |
19 | [email protected] " " | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "f" |
21 | [email protected] "f" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] ")" |
24 | [email protected] ")" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] | 27 | [email protected] "}" |
28 | [email protected] "{" | 28 | [email protected] "\n" |
29 | [email protected] "}" | 29 | [email protected] "}" |
30 | [email protected] "\n" | ||
31 | [email protected] "}" | ||
32 | [email protected] "\n" | 30 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast index c0162c609..299bbd136 100644 --- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast | |||
@@ -9,35 +9,33 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "unsafe" |
16 | [email protected] "unsafe" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] "fn" |
18 | [email protected] "fn" | 18 | [email protected] " " |
19 | [email protected] " " | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "f" |
21 | [email protected] "f" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] ")" |
24 | [email protected] ")" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "{" |
27 | [email protected] | 27 | [email protected] "}" |
28 | [email protected] "{" | 28 | [email protected] "\n " |
29 | [email protected] "}" | 29 | [email protected] |
30 | [email protected] "\n " | 30 | [email protected] "unsafe" |
31 | [email protected] | 31 | [email protected] " " |
32 | [email protected] "unsafe" | 32 | [email protected] |
33 | [email protected] " " | 33 | [email protected] "{" |
34 | [email protected] | 34 | [email protected] " " |
35 | [email protected] "{" | 35 | [email protected] |
36 | [email protected] " " | 36 | [email protected] "92" |
37 | [email protected] | 37 | [email protected] " " |
38 | [email protected] "92" | 38 | [email protected] "}" |
39 | [email protected] " " | 39 | [email protected] "\n" |
40 | [email protected] "}" | 40 | [email protected] "}" |
41 | [email protected] "\n" | ||
42 | [email protected] "}" | ||
43 | [email protected] "\n" | 41 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast index 6c0daef52..de3c4b786 100644 --- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast +++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast | |||
@@ -9,178 +9,177 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "x" |
20 | [email protected] "x" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "1" |
27 | [email protected] "1" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "+" |
29 | [email protected] "+" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "2" |
34 | [email protected] "2" | 34 | [email protected] " " |
35 | [email protected] " " | 35 | [email protected] "*" |
36 | [email protected] "*" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "3" |
39 | [email protected] "3" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] "%" |
41 | [email protected] "%" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "4" |
44 | [email protected] "4" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] "-" |
46 | [email protected] "-" | 46 | [email protected] " " |
47 | [email protected] " " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "5" |
50 | [email protected] "5" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] "/" |
52 | [email protected] "/" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "6" |
55 | [email protected] "6" | 55 | [email protected] ";" |
56 | [email protected] ";" | 56 | [email protected] "\n " |
57 | [email protected] "\n " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "1" |
61 | [email protected] "1" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] "+" |
63 | [email protected] "+" | 63 | [email protected] " " |
64 | [email protected] " " | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "2" |
67 | [email protected] "2" | 67 | [email protected] " " |
68 | [email protected] " " | 68 | [email protected] "*" |
69 | [email protected] "*" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "3" |
72 | [email protected] "3" | 72 | [email protected] ";" |
73 | [email protected] ";" | 73 | [email protected] "\n " |
74 | [email protected] "\n " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "1" |
78 | [email protected] "1" | 78 | [email protected] " " |
79 | [email protected] " " | 79 | [email protected] "<<" |
80 | [email protected] "<<" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "2" |
84 | [email protected] "2" | 84 | [email protected] " " |
85 | [email protected] " " | 85 | [email protected] "+" |
86 | [email protected] "+" | 86 | [email protected] " " |
87 | [email protected] " " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "3" |
89 | [email protected] "3" | 89 | [email protected] ";" |
90 | [email protected] ";" | 90 | [email protected] "\n " |
91 | [email protected] "\n " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] "1" |
95 | [email protected] "1" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] "&" |
97 | [email protected] "&" | 97 | [email protected] " " |
98 | [email protected] " " | 98 | [email protected] |
99 | [email protected] | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] "2" |
101 | [email protected] "2" | 101 | [email protected] " " |
102 | [email protected] " " | 102 | [email protected] ">>" |
103 | [email protected] ">>" | 103 | [email protected] " " |
104 | [email protected] " " | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] "3" |
106 | [email protected] "3" | 106 | [email protected] ";" |
107 | [email protected] ";" | 107 | [email protected] "\n " |
108 | [email protected] "\n " | 108 | [email protected] |
109 | [email protected] | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] |
111 | [email protected] | 111 | [email protected] "1" |
112 | [email protected] "1" | 112 | [email protected] " " |
113 | [email protected] " " | 113 | [email protected] "^" |
114 | [email protected] "^" | 114 | [email protected] " " |
115 | [email protected] " " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] "2" |
118 | [email protected] "2" | 118 | [email protected] " " |
119 | [email protected] " " | 119 | [email protected] "&" |
120 | [email protected] "&" | 120 | [email protected] " " |
121 | [email protected] " " | 121 | [email protected] |
122 | [email protected] | 122 | [email protected] "3" |
123 | [email protected] "3" | 123 | [email protected] ";" |
124 | [email protected] ";" | 124 | [email protected] "\n " |
125 | [email protected] "\n " | 125 | [email protected] |
126 | [email protected] | 126 | [email protected] |
127 | [email protected] | 127 | [email protected] |
128 | [email protected] | 128 | [email protected] "1" |
129 | [email protected] "1" | 129 | [email protected] " " |
130 | [email protected] " " | 130 | [email protected] "|" |
131 | [email protected] "|" | 131 | [email protected] " " |
132 | [email protected] " " | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] |
134 | [email protected] | 134 | [email protected] "2" |
135 | [email protected] "2" | 135 | [email protected] " " |
136 | [email protected] " " | 136 | [email protected] "^" |
137 | [email protected] "^" | 137 | [email protected] " " |
138 | [email protected] " " | 138 | [email protected] |
139 | [email protected] | 139 | [email protected] "3" |
140 | [email protected] "3" | 140 | [email protected] ";" |
141 | [email protected] ";" | 141 | [email protected] "\n " |
142 | [email protected] "\n " | 142 | [email protected] |
143 | [email protected] | 143 | [email protected] |
144 | [email protected] | 144 | [email protected] |
145 | [email protected] | 145 | [email protected] "1" |
146 | [email protected] "1" | 146 | [email protected] " " |
147 | [email protected] " " | 147 | [email protected] "==" |
148 | [email protected] "==" | 148 | [email protected] " " |
149 | [email protected] " " | 149 | [email protected] |
150 | [email protected] | 150 | [email protected] |
151 | [email protected] | 151 | [email protected] "2" |
152 | [email protected] "2" | 152 | [email protected] " " |
153 | [email protected] " " | 153 | [email protected] "|" |
154 | [email protected] "|" | 154 | [email protected] " " |
155 | [email protected] " " | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] "3" |
157 | [email protected] "3" | 157 | [email protected] ";" |
158 | [email protected] ";" | 158 | [email protected] "\n " |
159 | [email protected] "\n " | 159 | [email protected] |
160 | [email protected] | 160 | [email protected] |
161 | [email protected] | 161 | [email protected] |
162 | [email protected] | 162 | [email protected] "1" |
163 | [email protected] "1" | 163 | [email protected] " " |
164 | [email protected] " " | 164 | [email protected] "&&" |
165 | [email protected] "&&" | 165 | [email protected] " " |
166 | [email protected] " " | 166 | [email protected] |
167 | [email protected] | 167 | [email protected] |
168 | [email protected] | 168 | [email protected] "2" |
169 | [email protected] "2" | 169 | [email protected] " " |
170 | [email protected] " " | 170 | [email protected] "==" |
171 | [email protected] "==" | 171 | [email protected] " " |
172 | [email protected] " " | 172 | [email protected] |
173 | [email protected] | 173 | [email protected] "3" |
174 | [email protected] "3" | 174 | [email protected] ";" |
175 | [email protected] ";" | 175 | [email protected] "\n " |
176 | [email protected] "\n " | 176 | [email protected] "//1 || 2 && 2;" |
177 | [email protected] "//1 || 2 && 2;" | 177 | [email protected] "\n " |
178 | [email protected] "\n " | 178 | [email protected] "//1 .. 2 || 3;" |
179 | [email protected] "//1 .. 2 || 3;" | 179 | [email protected] "\n " |
180 | [email protected] "\n " | 180 | [email protected] "//1 = 2 .. 3;" |
181 | [email protected] "//1 = 2 .. 3;" | 181 | [email protected] "\n " |
182 | [email protected] "\n " | 182 | [email protected] "//---&*1 - --2 * 9;" |
183 | [email protected] "//---&*1 - --2 * 9;" | 183 | [email protected] "\n" |
184 | [email protected] "\n" | 184 | [email protected] "}" |
185 | [email protected] "}" | ||
186 | [email protected] "\n" | 185 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast index 8177bd89b..dc47d68a6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast +++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast | |||
@@ -9,144 +9,143 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] ".." |
17 | [email protected] ".." | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "1" |
20 | [email protected] "1" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "+" |
22 | [email protected] "+" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "1" |
25 | [email protected] "1" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] "\n " |
27 | [email protected] "\n " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] ".." |
31 | [email protected] ".." | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "z" |
36 | [email protected] "z" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "=" |
38 | [email protected] "=" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "2" |
41 | [email protected] "2" | 41 | [email protected] ";" |
42 | [email protected] ";" | 42 | [email protected] "\n " |
43 | [email protected] "\n " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "x" |
50 | [email protected] "x" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] "=" |
52 | [email protected] "=" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "false" |
56 | [email protected] "false" | 56 | [email protected] ".." |
57 | [email protected] ".." | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "1" |
60 | [email protected] "1" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] "==" |
62 | [email protected] "==" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "1" |
65 | [email protected] "1" | 65 | [email protected] ";" |
66 | [email protected] ";" | 66 | [email protected] "\n " |
67 | [email protected] "\n " | 67 | [email protected] |
68 | [email protected] | 68 | [email protected] "let" |
69 | [email protected] "let" | 69 | [email protected] " " |
70 | [email protected] " " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "x" |
73 | [email protected] "x" | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] "=" |
75 | [email protected] "=" | 75 | [email protected] " " |
76 | [email protected] " " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] "1" |
79 | [email protected] "1" | 79 | [email protected] ".." |
80 | [email protected] ".." | 80 | [email protected] ";" |
81 | [email protected] ";" | 81 | [email protected] "\n \n " |
82 | [email protected] "\n \n " | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "..=" |
85 | [email protected] "..=" | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "1" |
88 | [email protected] "1" | 88 | [email protected] " " |
89 | [email protected] " " | 89 | [email protected] "+" |
90 | [email protected] "+" | 90 | [email protected] " " |
91 | [email protected] " " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "1" |
93 | [email protected] "1" | 93 | [email protected] ";" |
94 | [email protected] ";" | 94 | [email protected] "\n " |
95 | [email protected] "\n " | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] |
97 | [email protected] | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "..=" |
99 | [email protected] "..=" | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] |
101 | [email protected] | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] "z" |
104 | [email protected] "z" | 104 | [email protected] " " |
105 | [email protected] " " | 105 | [email protected] "=" |
106 | [email protected] "=" | 106 | [email protected] " " |
107 | [email protected] " " | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "2" |
109 | [email protected] "2" | 109 | [email protected] ";" |
110 | [email protected] ";" | 110 | [email protected] "\n " |
111 | [email protected] "\n " | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] |
113 | [email protected] | 113 | [email protected] |
114 | [email protected] | 114 | [email protected] |
115 | [email protected] | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] "x" |
118 | [email protected] "x" | 118 | [email protected] " " |
119 | [email protected] " " | 119 | [email protected] "=" |
120 | [email protected] "=" | 120 | [email protected] " " |
121 | [email protected] " " | 121 | [email protected] |
122 | [email protected] | 122 | [email protected] |
123 | [email protected] | 123 | [email protected] "false" |
124 | [email protected] "false" | 124 | [email protected] "..=" |
125 | [email protected] "..=" | 125 | [email protected] |
126 | [email protected] | 126 | [email protected] |
127 | [email protected] | 127 | [email protected] "1" |
128 | [email protected] "1" | 128 | [email protected] " " |
129 | [email protected] " " | 129 | [email protected] "==" |
130 | [email protected] "==" | 130 | [email protected] " " |
131 | [email protected] " " | 131 | [email protected] |
132 | [email protected] | 132 | [email protected] "1" |
133 | [email protected] "1" | 133 | [email protected] ";" |
134 | [email protected] ";" | 134 | [email protected] "\n " |
135 | [email protected] "\n " | 135 | [email protected] |
136 | [email protected] | 136 | [email protected] "let" |
137 | [email protected] "let" | 137 | [email protected] " " |
138 | [email protected] " " | 138 | [email protected] |
139 | [email protected] | 139 | [email protected] |
140 | [email protected] | 140 | [email protected] "x" |
141 | [email protected] "x" | 141 | [email protected] " " |
142 | [email protected] " " | 142 | [email protected] "=" |
143 | [email protected] "=" | 143 | [email protected] " " |
144 | [email protected] " " | 144 | [email protected] |
145 | [email protected] | 145 | [email protected] |
146 | [email protected] | 146 | [email protected] "1" |
147 | [email protected] "1" | 147 | [email protected] ".." |
148 | [email protected] ".." | 148 | [email protected] ";" |
149 | [email protected] ";" | 149 | [email protected] "\n" |
150 | [email protected] "\n" | 150 | [email protected] "}" |
151 | [email protected] "}" | ||
152 | [email protected] "\n" | 151 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast index 953930f6c..86c3b46c4 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast | |||
@@ -9,56 +9,55 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "_" |
19 | [email protected] "_" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "=" |
21 | [email protected] "=" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "\'c\'u32" |
24 | [email protected] "\'c\'u32" | 24 | [email protected] ";" |
25 | [email protected] ";" | 25 | [email protected] "\n " |
26 | [email protected] "\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "let" |
28 | [email protected] "let" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "_" |
31 | [email protected] "_" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] "=" |
33 | [email protected] "=" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "\"string\"invalid" |
36 | [email protected] "\"string\"invalid" | 36 | [email protected] ";" |
37 | [email protected] ";" | 37 | [email protected] "\n " |
38 | [email protected] "\n " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "let" |
40 | [email protected] "let" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "_" |
43 | [email protected] "_" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "=" |
45 | [email protected] "=" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "b\'b\'_suff" |
48 | [email protected] "b\'b\'_suff" | 48 | [email protected] ";" |
49 | [email protected] ";" | 49 | [email protected] "\n " |
50 | [email protected] "\n " | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "let" |
52 | [email protected] "let" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "_" |
55 | [email protected] "_" | 55 | [email protected] " " |
56 | [email protected] " " | 56 | [email protected] "=" |
57 | [email protected] "=" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "b\"bs\"invalid" |
60 | [email protected] "b\"bs\"invalid" | 60 | [email protected] ";" |
61 | [email protected] ";" | 61 | [email protected] "\n" |
62 | [email protected] "\n" | 62 | [email protected] "}" |
63 | [email protected] "}" | ||
64 | [email protected] "\n" | 63 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast index 68eb16bbd..8d76c4e0b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast +++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast | |||
@@ -85,7 +85,6 @@ [email protected] | |||
85 | [email protected] "," | 85 | [email protected] "," |
86 | [email protected] "\n" | 86 | [email protected] "\n" |
87 | [email protected] | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "{" |
89 | [email protected] "{" | 89 | [email protected] "}" |
90 | [email protected] "}" | ||
91 | [email protected] "\n" | 90 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast index 3977faa60..13b730ded 100644 --- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast +++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast | |||
@@ -11,210 +11,205 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "\n " |
16 | [email protected] "\n " | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "\'empty_block" |
20 | [email protected] "\'empty_block" | 20 | [email protected] ":" |
21 | [email protected] ":" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "}" |
25 | [email protected] "}" | 25 | [email protected] "\n\n " |
26 | [email protected] "\n\n " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "\'block" |
30 | [email protected] "\'block" | 30 | [email protected] ":" |
31 | [email protected] ":" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "{" |
34 | [email protected] "{" | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "do_thing" |
42 | [email protected] "do_thing" | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "(" |
44 | [email protected] "(" | 44 | [email protected] ")" |
45 | [email protected] ")" | 45 | [email protected] ";" |
46 | [email protected] ";" | 46 | [email protected] "\n " |
47 | [email protected] "\n " | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "if" |
50 | [email protected] "if" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "condition_not_met" |
58 | [email protected] "condition_not_met" | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "(" |
60 | [email protected] "(" | 60 | [email protected] ")" |
61 | [email protected] ")" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "{" |
64 | [email protected] | 64 | [email protected] "\n " |
65 | [email protected] "{" | 65 | [email protected] |
66 | [email protected] "\n " | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] "break" |
68 | [email protected] | 68 | [email protected] " " |
69 | [email protected] "break" | 69 | [email protected] "\'block" |
70 | [email protected] " " | 70 | [email protected] ";" |
71 | [email protected] "\'block" | 71 | [email protected] "\n " |
72 | [email protected] ";" | 72 | [email protected] "}" |
73 | [email protected] "\n " | 73 | [email protected] "\n " |
74 | [email protected] "}" | 74 | [email protected] |
75 | [email protected] "\n " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "do_next_thing" |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] "do_next_thing" | 82 | [email protected] "(" |
83 | [email protected] | 83 | [email protected] ")" |
84 | [email protected] "(" | 84 | [email protected] ";" |
85 | [email protected] ")" | 85 | [email protected] "\n " |
86 | [email protected] ";" | 86 | [email protected] |
87 | [email protected] "\n " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "if" |
89 | [email protected] | 89 | [email protected] " " |
90 | [email protected] "if" | 90 | [email protected] |
91 | [email protected] " " | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] "condition_not_met" |
97 | [email protected] | 97 | [email protected] |
98 | [email protected] "condition_not_met" | 98 | [email protected] "(" |
99 | [email protected] | 99 | [email protected] ")" |
100 | [email protected] "(" | 100 | [email protected] " " |
101 | [email protected] ")" | 101 | [email protected] |
102 | [email protected] " " | 102 | [email protected] "{" |
103 | [email protected] | 103 | [email protected] "\n " |
104 | [email protected] | 104 | [email protected] |
105 | [email protected] "{" | 105 | [email protected] |
106 | [email protected] "\n " | 106 | [email protected] "break" |
107 | [email protected] | 107 | [email protected] " " |
108 | [email protected] | 108 | [email protected] "\'block" |
109 | [email protected] "break" | 109 | [email protected] ";" |
110 | [email protected] " " | 110 | [email protected] "\n " |
111 | [email protected] "\'block" | 111 | [email protected] "}" |
112 | [email protected] ";" | 112 | [email protected] "\n " |
113 | [email protected] "\n " | 113 | [email protected] |
114 | [email protected] "}" | 114 | [email protected] |
115 | [email protected] "\n " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] "do_last_thing" |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] "(" |
122 | [email protected] "do_last_thing" | 122 | [email protected] ")" |
123 | [email protected] | 123 | [email protected] ";" |
124 | [email protected] "(" | 124 | [email protected] "\n " |
125 | [email protected] ")" | 125 | [email protected] "}" |
126 | [email protected] ";" | 126 | [email protected] "\n\n " |
127 | [email protected] "\n " | 127 | [email protected] |
128 | [email protected] "}" | 128 | [email protected] "let" |
129 | [email protected] "\n\n " | 129 | [email protected] " " |
130 | [email protected] | 130 | [email protected] |
131 | [email protected] "let" | 131 | [email protected] |
132 | [email protected] " " | 132 | [email protected] "result" |
133 | [email protected] | 133 | [email protected] " " |
134 | [email protected] | 134 | [email protected] "=" |
135 | [email protected] "result" | 135 | [email protected] " " |
136 | [email protected] " " | 136 | [email protected] |
137 | [email protected] "=" | 137 | [email protected] |
138 | [email protected] " " | 138 | [email protected] "\'block" |
139 | [email protected] | 139 | [email protected] ":" |
140 | [email protected] | 140 | [email protected] " " |
141 | [email protected] "\'block" | 141 | [email protected] |
142 | [email protected] ":" | 142 | [email protected] "{" |
143 | [email protected] " " | 143 | [email protected] "\n " |
144 | [email protected] | 144 | [email protected] |
145 | [email protected] "{" | 145 | [email protected] |
146 | [email protected] "\n " | 146 | [email protected] "if" |
147 | [email protected] | 147 | [email protected] " " |
148 | [email protected] | 148 | [email protected] |
149 | [email protected] "if" | 149 | [email protected] |
150 | [email protected] " " | 150 | [email protected] |
151 | [email protected] | 151 | [email protected] |
152 | [email protected] | 152 | [email protected] |
153 | [email protected] | 153 | [email protected] |
154 | [email protected] | 154 | [email protected] "foo" |
155 | [email protected] | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] "(" |
157 | [email protected] "foo" | 157 | [email protected] ")" |
158 | [email protected] | 158 | [email protected] " " |
159 | [email protected] "(" | 159 | [email protected] |
160 | [email protected] ")" | 160 | [email protected] "{" |
161 | [email protected] " " | 161 | [email protected] "\n " |
162 | [email protected] | 162 | [email protected] "// comment" |
163 | [email protected] | 163 | [email protected] "\n " |
164 | [email protected] "{" | 164 | [email protected] |
165 | [email protected] "\n " | 165 | [email protected] |
166 | [email protected] "// comment" | 166 | [email protected] "break" |
167 | [email protected] "\n " | 167 | [email protected] " " |
168 | [email protected] | 168 | [email protected] "\'block" |
169 | [email protected] | 169 | [email protected] " " |
170 | [email protected] "break" | 170 | [email protected] |
171 | [email protected] " " | 171 | [email protected] "1" |
172 | [email protected] "\'block" | 172 | [email protected] ";" |
173 | [email protected] " " | 173 | [email protected] "\n " |
174 | [email protected] | 174 | [email protected] "}" |
175 | [email protected] "1" | 175 | [email protected] "\n " |
176 | [email protected] ";" | 176 | [email protected] |
177 | [email protected] "\n " | 177 | [email protected] |
178 | [email protected] "}" | 178 | [email protected] "if" |
179 | [email protected] "\n " | 179 | [email protected] " " |
180 | [email protected] | 180 | [email protected] |
181 | [email protected] | 181 | [email protected] |
182 | [email protected] "if" | 182 | [email protected] |
183 | [email protected] " " | 183 | [email protected] |
184 | [email protected] | 184 | [email protected] |
185 | [email protected] | 185 | [email protected] |
186 | [email protected] | 186 | [email protected] "bar" |
187 | [email protected] | 187 | [email protected] |
188 | [email protected] | 188 | [email protected] "(" |
189 | [email protected] | 189 | [email protected] ")" |
190 | [email protected] "bar" | 190 | [email protected] " " |
191 | [email protected] | 191 | [email protected] |
192 | [email protected] "(" | 192 | [email protected] "{" |
193 | [email protected] ")" | 193 | [email protected] "\n " |
194 | [email protected] " " | 194 | [email protected] "/* comment */" |
195 | [email protected] | 195 | [email protected] "\n " |
196 | [email protected] | 196 | [email protected] |
197 | [email protected] "{" | 197 | [email protected] |
198 | [email protected] "\n " | 198 | [email protected] "break" |
199 | [email protected] "/* comment */" | 199 | [email protected] " " |
200 | [email protected] "\n " | 200 | [email protected] "\'block" |
201 | [email protected] | 201 | [email protected] " " |
202 | [email protected] | 202 | [email protected] |
203 | [email protected] "break" | 203 | [email protected] "2" |
204 | [email protected] " " | 204 | [email protected] ";" |
205 | [email protected] "\'block" | 205 | [email protected] "\n " |
206 | [email protected] " " | 206 | [email protected] "}" |
207 | [email protected] | 207 | [email protected] "\n " |
208 | [email protected] "2" | 208 | [email protected] |
209 | [email protected] ";" | 209 | [email protected] "3" |
210 | [email protected] "\n " | 210 | [email protected] "\n " |
211 | [email protected] "}" | 211 | [email protected] "}" |
212 | [email protected] "\n " | 212 | [email protected] ";" |
213 | [email protected] | 213 | [email protected] "\n" |
214 | [email protected] "3" | 214 | [email protected] "}" |
215 | [email protected] "\n " | ||
216 | [email protected] "}" | ||
217 | [email protected] ";" | ||
218 | [email protected] "\n" | ||
219 | [email protected] "}" | ||
220 | [email protected] "\n" | 215 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast index 3b9e8c71c..21874ae3a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast +++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast | |||
@@ -9,34 +9,33 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "make_query" |
21 | [email protected] "make_query" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "crate" |
29 | [email protected] "crate" | 29 | [email protected] "::" |
30 | [email protected] "::" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "module_map" |
33 | [email protected] "module_map" | 33 | [email protected] "::" |
34 | [email protected] "::" | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "module_tree" |
37 | [email protected] "module_tree" | 37 | [email protected] ")" |
38 | [email protected] ")" | 38 | [email protected] ";" |
39 | [email protected] ";" | 39 | [email protected] "\n" |
40 | [email protected] "\n" | 40 | [email protected] "}" |
41 | [email protected] "}" | ||
42 | [email protected] "\n" | 41 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 9af689635..eb59d6e17 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | |||
@@ -139,33 +139,32 @@ [email protected] | |||
139 | [email protected] "bool" | 139 | [email protected] "bool" |
140 | [email protected] " " | 140 | [email protected] " " |
141 | [email protected] | 141 | [email protected] |
142 | [email protected] | 142 | [email protected] "{" |
143 | [email protected] "{" | 143 | [email protected] " " |
144 | [email protected] " " | 144 | [email protected] |
145 | [email protected] | 145 | [email protected] "let" |
146 | [email protected] "let" | 146 | [email protected] " " |
147 | [email protected] " " | 147 | [email protected] |
148 | [email protected] | 148 | [email protected] |
149 | [email protected] | 149 | [email protected] "_x" |
150 | [email protected] "_x" | 150 | [email protected] ":" |
151 | [email protected] ":" | 151 | [email protected] " " |
152 | [email protected] " " | 152 | [email protected] |
153 | [email protected] | 153 | [email protected] |
154 | [email protected] | 154 | [email protected] |
155 | [email protected] | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] "bool" |
157 | [email protected] "bool" | 157 | [email protected] " " |
158 | [email protected] " " | 158 | [email protected] "=" |
159 | [email protected] "=" | 159 | [email protected] " " |
160 | [email protected] " " | 160 | [email protected] |
161 | [email protected] | 161 | [email protected] "return" |
162 | [email protected] "return" | 162 | [email protected] " " |
163 | [email protected] " " | 163 | [email protected] |
164 | [email protected] | 164 | [email protected] "true" |
165 | [email protected] "true" | 165 | [email protected] ";" |
166 | [email protected] ";" | 166 | [email protected] " " |
167 | [email protected] " " | 167 | [email protected] "}" |
168 | [email protected] "}" | ||
169 | [email protected] "\n\n" | 168 | [email protected] "\n\n" |
170 | [email protected] | 169 | [email protected] |
171 | [email protected] "fn" | 170 | [email protected] "fn" |
@@ -177,48 +176,46 @@ [email protected] | |||
177 | [email protected] ")" | 176 | [email protected] ")" |
178 | [email protected] " " | 177 | [email protected] " " |
179 | [email protected] | 178 | [email protected] |
180 | [email protected] | 179 | [email protected] "{" |
181 | [email protected] "{" | 180 | [email protected] "\n " |
182 | [email protected] "\n " | 181 | [email protected] |
183 | [email protected] | 182 | [email protected] "fn" |
184 | [email protected] "fn" | 183 | [email protected] " " |
185 | [email protected] " " | 184 | [email protected] |
186 | [email protected] | 185 | [email protected] "f" |
187 | [email protected] "f" | 186 | [email protected] |
188 | [email protected] | 187 | [email protected] "(" |
189 | [email protected] "(" | 188 | [email protected] |
190 | [email protected] | 189 | [email protected] |
191 | [email protected] | 190 | [email protected] |
192 | [email protected] | 191 | [email protected] "_x" |
193 | [email protected] "_x" | 192 | [email protected] ":" |
194 | [email protected] ":" | 193 | [email protected] " " |
195 | [email protected] " " | 194 | [email protected] |
196 | [email protected] | 195 | [email protected] "(" |
197 | [email protected] "(" | 196 | [email protected] ")" |
198 | [email protected] ")" | 197 | [email protected] ")" |
199 | [email protected] ")" | 198 | [email protected] " " |
200 | [email protected] " " | 199 | [email protected] |
201 | [email protected] | 200 | [email protected] "{" |
202 | [email protected] | 201 | [email protected] " " |
203 | [email protected] "{" | 202 | [email protected] "}" |
204 | [email protected] " " | 203 | [email protected] "\n " |
205 | [email protected] "}" | 204 | [email protected] |
206 | [email protected] "\n " | 205 | [email protected] |
207 | [email protected] | 206 | [email protected] |
208 | [email protected] | 207 | [email protected] |
209 | [email protected] | 208 | [email protected] |
210 | [email protected] | 209 | [email protected] |
211 | [email protected] | 210 | [email protected] "f" |
212 | [email protected] | 211 | [email protected] |
213 | [email protected] "f" | 212 | [email protected] "(" |
214 | [email protected] | 213 | [email protected] |
215 | [email protected] "(" | 214 | [email protected] "return" |
216 | [email protected] | 215 | [email protected] ")" |
217 | [email protected] "return" | 216 | [email protected] ";" |
218 | [email protected] ")" | 217 | [email protected] "\n" |
219 | [email protected] ";" | 218 | [email protected] "}" |
220 | [email protected] "\n" | ||
221 | [email protected] "}" | ||
222 | [email protected] "\n\n" | 219 | [email protected] "\n\n" |
223 | [email protected] | 220 | [email protected] |
224 | [email protected] "fn" | 221 | [email protected] "fn" |
@@ -230,189 +227,185 @@ [email protected] | |||
230 | [email protected] ")" | 227 | [email protected] ")" |
231 | [email protected] " " | 228 | [email protected] " " |
232 | [email protected] | 229 | [email protected] |
233 | [email protected] | 230 | [email protected] "{" |
234 | [email protected] "{" | 231 | [email protected] "\n " |
235 | [email protected] "\n " | 232 | [email protected] |
236 | [email protected] | 233 | [email protected] "fn" |
237 | [email protected] "fn" | 234 | [email protected] " " |
238 | [email protected] " " | 235 | [email protected] |
239 | [email protected] | 236 | [email protected] "the" |
240 | [email protected] "the" | 237 | [email protected] |
241 | [email protected] | 238 | [email protected] "(" |
242 | [email protected] "(" | 239 | [email protected] |
243 | [email protected] | 240 | [email protected] |
244 | [email protected] | 241 | [email protected] |
245 | [email protected] | 242 | [email protected] "x" |
246 | [email protected] "x" | 243 | [email protected] ":" |
247 | [email protected] ":" | 244 | [email protected] " " |
248 | [email protected] " " | 245 | [email protected] |
249 | [email protected] | 246 | [email protected] "&" |
250 | [email protected] "&" | 247 | [email protected] |
251 | [email protected] | 248 | [email protected] |
252 | [email protected] | 249 | [email protected] |
253 | [email protected] | 250 | [email protected] |
254 | [email protected] | 251 | [email protected] "Cell" |
255 | [email protected] "Cell" | 252 | [email protected] |
256 | [email protected] | 253 | [email protected] "<" |
257 | [email protected] "<" | 254 | [email protected] |
258 | [email protected] | 255 | [email protected] |
259 | [email protected] | 256 | [email protected] |
260 | [email protected] | 257 | [email protected] |
261 | [email protected] | 258 | [email protected] |
262 | [email protected] | 259 | [email protected] "bool" |
263 | [email protected] "bool" | 260 | [email protected] ">" |
264 | [email protected] ">" | 261 | [email protected] ")" |
265 | [email protected] ")" | 262 | [email protected] " " |
266 | [email protected] " " | 263 | [email protected] |
267 | [email protected] | 264 | [email protected] "{" |
268 | [email protected] | 265 | [email protected] "\n " |
269 | [email protected] "{" | 266 | [email protected] |
270 | [email protected] "\n " | 267 | [email protected] |
271 | [email protected] | 268 | [email protected] "return" |
272 | [email protected] | 269 | [email protected] " " |
273 | [email protected] "return" | 270 | [email protected] |
274 | [email protected] " " | 271 | [email protected] "while" |
275 | [email protected] | 272 | [email protected] " " |
276 | [email protected] "while" | 273 | [email protected] |
277 | [email protected] " " | 274 | [email protected] |
278 | [email protected] | 275 | [email protected] "!" |
279 | [email protected] | 276 | [email protected] |
280 | [email protected] "!" | 277 | [email protected] |
281 | [email protected] | 278 | [email protected] |
282 | [email protected] | 279 | [email protected] |
283 | [email protected] | 280 | [email protected] |
284 | [email protected] | 281 | [email protected] "x" |
285 | [email protected] | 282 | [email protected] "." |
286 | [email protected] "x" | 283 | [email protected] |
287 | [email protected] "." | 284 | [email protected] "get" |
288 | [email protected] | 285 | [email protected] |
289 | [email protected] "get" | 286 | [email protected] "(" |
290 | [email protected] | 287 | [email protected] ")" |
291 | [email protected] "(" | 288 | [email protected] " " |
292 | [email protected] ")" | 289 | [email protected] |
293 | [email protected] " " | 290 | [email protected] "{" |
294 | [email protected] | 291 | [email protected] " " |
295 | [email protected] | 292 | [email protected] |
296 | [email protected] "{" | 293 | [email protected] |
297 | [email protected] " " | 294 | [email protected] |
298 | [email protected] | 295 | [email protected] |
299 | [email protected] | 296 | [email protected] |
300 | [email protected] | 297 | [email protected] |
301 | [email protected] | 298 | [email protected] "x" |
302 | [email protected] | 299 | [email protected] "." |
303 | [email protected] | 300 | [email protected] |
304 | [email protected] "x" | 301 | [email protected] "set" |
305 | [email protected] "." | 302 | [email protected] |
306 | [email protected] | 303 | [email protected] "(" |
307 | [email protected] "set" | 304 | [email protected] |
308 | [email protected] | 305 | [email protected] "true" |
309 | [email protected] "(" | 306 | [email protected] ")" |
310 | [email protected] | 307 | [email protected] ";" |
311 | [email protected] "true" | 308 | [email protected] " " |
312 | [email protected] ")" | 309 | [email protected] "}" |
313 | [email protected] ";" | 310 | [email protected] ";" |
314 | [email protected] " " | 311 | [email protected] "\n " |
315 | [email protected] "}" | 312 | [email protected] "}" |
316 | [email protected] ";" | 313 | [email protected] "\n " |
317 | [email protected] "\n " | 314 | [email protected] |
318 | [email protected] "}" | 315 | [email protected] "let" |
319 | [email protected] "\n " | 316 | [email protected] " " |
320 | [email protected] | 317 | [email protected] |
321 | [email protected] "let" | 318 | [email protected] |
322 | [email protected] " " | 319 | [email protected] "i" |
323 | [email protected] | 320 | [email protected] " " |
324 | [email protected] | 321 | [email protected] "=" |
325 | [email protected] "i" | 322 | [email protected] " " |
326 | [email protected] " " | 323 | [email protected] |
327 | [email protected] "=" | 324 | [email protected] "&" |
328 | [email protected] " " | 325 | [email protected] |
329 | [email protected] | 326 | [email protected] |
330 | [email protected] "&" | 327 | [email protected] |
331 | [email protected] | 328 | [email protected] |
332 | [email protected] | 329 | [email protected] |
333 | [email protected] | 330 | [email protected] |
334 | [email protected] | 331 | [email protected] "Cell" |
335 | [email protected] | 332 | [email protected] "::" |
336 | [email protected] | 333 | [email protected] |
337 | [email protected] "Cell" | 334 | [email protected] |
338 | [email protected] "::" | 335 | [email protected] "new" |
339 | [email protected] | 336 | [email protected] |
340 | [email protected] | 337 | [email protected] "(" |
341 | [email protected] "new" | 338 | [email protected] |
342 | [email protected] | 339 | [email protected] "false" |
343 | [email protected] "(" | 340 | [email protected] ")" |
344 | [email protected] | 341 | [email protected] ";" |
345 | [email protected] "false" | 342 | [email protected] "\n " |
346 | [email protected] ")" | 343 | [email protected] |
347 | [email protected] ";" | 344 | [email protected] "let" |
348 | [email protected] "\n " | 345 | [email protected] " " |
349 | [email protected] | 346 | [email protected] |
350 | [email protected] "let" | 347 | [email protected] |
351 | [email protected] " " | 348 | [email protected] "dont" |
352 | [email protected] | 349 | [email protected] " " |
353 | [email protected] | 350 | [email protected] "=" |
354 | [email protected] "dont" | 351 | [email protected] " " |
355 | [email protected] " " | 352 | [email protected] |
356 | [email protected] "=" | 353 | [email protected] "{" |
357 | [email protected] " " | 354 | [email protected] |
358 | [email protected] | 355 | [email protected] |
359 | [email protected] | 356 | [email protected] "|" |
360 | [email protected] "{" | 357 | [email protected] "|" |
361 | [email protected] | 358 | [email protected] |
362 | [email protected] | 359 | [email protected] |
363 | [email protected] "|" | 360 | [email protected] |
364 | [email protected] "|" | 361 | [email protected] |
365 | [email protected] | 362 | [email protected] |
366 | [email protected] | 363 | [email protected] "the" |
367 | [email protected] | 364 | [email protected] |
368 | [email protected] | 365 | [email protected] "(" |
369 | [email protected] | 366 | [email protected] |
370 | [email protected] "the" | 367 | [email protected] |
371 | [email protected] | 368 | [email protected] |
372 | [email protected] "(" | 369 | [email protected] |
373 | [email protected] | 370 | [email protected] "i" |
374 | [email protected] | 371 | [email protected] ")" |
375 | [email protected] | 372 | [email protected] "}" |
376 | [email protected] | 373 | [email protected] ";" |
377 | [email protected] "i" | 374 | [email protected] "\n " |
378 | [email protected] ")" | 375 | [email protected] |
379 | [email protected] "}" | 376 | [email protected] |
380 | [email protected] ";" | 377 | [email protected] |
381 | [email protected] "\n " | 378 | [email protected] |
382 | [email protected] | 379 | [email protected] |
383 | [email protected] | 380 | [email protected] |
384 | [email protected] | 381 | [email protected] "dont" |
385 | [email protected] | 382 | [email protected] |
386 | [email protected] | 383 | [email protected] "(" |
387 | [email protected] | 384 | [email protected] ")" |
388 | [email protected] "dont" | 385 | [email protected] ";" |
389 | [email protected] | 386 | [email protected] "\n " |
390 | [email protected] "(" | 387 | [email protected] |
391 | [email protected] ")" | 388 | [email protected] |
392 | [email protected] ";" | 389 | [email protected] |
393 | [email protected] "\n " | 390 | [email protected] |
394 | [email protected] | 391 | [email protected] |
395 | [email protected] | 392 | [email protected] "assert" |
396 | [email protected] | 393 | [email protected] "!" |
397 | [email protected] | 394 | [email protected] |
398 | [email protected] | 395 | [email protected] "(" |
399 | [email protected] "assert" | 396 | [email protected] |
400 | [email protected] "!" | 397 | [email protected] "(" |
401 | [email protected] | 398 | [email protected] "i" |
402 | [email protected] "(" | 399 | [email protected] "." |
403 | [email protected] | 400 | [email protected] "get" |
404 | [email protected] "(" | 401 | [email protected] |
405 | [email protected] "i" | 402 | [email protected] "(" |
406 | [email protected] "." | 403 | [email protected] ")" |
407 | [email protected] "get" | 404 | [email protected] ")" |
408 | [email protected] | 405 | [email protected] ")" |
409 | [email protected] "(" | 406 | [email protected] ";" |
410 | [email protected] ")" | 407 | [email protected] "\n" |
411 | [email protected] ")" | 408 | [email protected] "}" |
412 | [email protected] ")" | ||
413 | [email protected] ";" | ||
414 | [email protected] "\n" | ||
415 | [email protected] "}" | ||
416 | [email protected] "\n\n" | 409 | [email protected] "\n\n" |
417 | [email protected] | 410 | [email protected] |
418 | [email protected] "fn" | 411 | [email protected] "fn" |
@@ -424,170 +417,160 @@ [email protected] | |||
424 | [email protected] ")" | 417 | [email protected] ")" |
425 | [email protected] " " | 418 | [email protected] " " |
426 | [email protected] | 419 | [email protected] |
427 | [email protected] | 420 | [email protected] "{" |
428 | [email protected] "{" | 421 | [email protected] "\n " |
429 | [email protected] "\n " | 422 | [email protected] |
430 | [email protected] | 423 | [email protected] "loop" |
431 | [email protected] "loop" | 424 | [email protected] " " |
432 | [email protected] " " | 425 | [email protected] |
433 | [email protected] | 426 | [email protected] "{" |
434 | [email protected] | 427 | [email protected] "\n " |
435 | [email protected] "{" | 428 | [email protected] |
436 | [email protected] "\n " | 429 | [email protected] |
437 | [email protected] | 430 | [email protected] "while" |
438 | [email protected] | 431 | [email protected] " " |
439 | [email protected] "while" | 432 | [email protected] |
440 | [email protected] " " | 433 | [email protected] |
441 | [email protected] | 434 | [email protected] "(" |
442 | [email protected] | 435 | [email protected] |
443 | [email protected] "(" | 436 | [email protected] "return" |
444 | [email protected] | 437 | [email protected] ")" |
445 | [email protected] "return" | 438 | [email protected] " " |
446 | [email protected] ")" | 439 | [email protected] |
447 | [email protected] " " | 440 | [email protected] "{" |
448 | [email protected] | 441 | [email protected] "\n " |
449 | [email protected] | 442 | [email protected] |
450 | [email protected] "{" | 443 | [email protected] "if" |
451 | [email protected] "\n " | 444 | [email protected] " " |
452 | [email protected] | 445 | [email protected] |
453 | [email protected] "if" | 446 | [email protected] |
454 | [email protected] " " | 447 | [email protected] "(" |
455 | [email protected] | 448 | [email protected] |
456 | [email protected] | 449 | [email protected] "return" |
457 | [email protected] "(" | 450 | [email protected] ")" |
458 | [email protected] | 451 | [email protected] " " |
459 | [email protected] "return" | 452 | [email protected] |
460 | [email protected] ")" | 453 | [email protected] "{" |
461 | [email protected] " " | 454 | [email protected] "\n " |
462 | [email protected] | 455 | [email protected] |
463 | [email protected] | 456 | [email protected] |
464 | [email protected] "{" | 457 | [email protected] "match" |
465 | [email protected] "\n " | 458 | [email protected] " " |
466 | [email protected] | 459 | [email protected] |
467 | [email protected] | 460 | [email protected] "(" |
468 | [email protected] "match" | 461 | [email protected] |
469 | [email protected] " " | 462 | [email protected] "return" |
470 | [email protected] | 463 | [email protected] ")" |
471 | [email protected] "(" | 464 | [email protected] " " |
472 | [email protected] | 465 | [email protected] |
473 | [email protected] "return" | 466 | [email protected] "{" |
474 | [email protected] ")" | 467 | [email protected] "\n " |
475 | [email protected] " " | 468 | [email protected] |
476 | [email protected] | 469 | [email protected] |
477 | [email protected] "{" | 470 | [email protected] |
478 | [email protected] "\n " | 471 | [email protected] "1" |
479 | [email protected] | 472 | [email protected] " " |
480 | [email protected] | 473 | [email protected] "=>" |
481 | [email protected] | 474 | [email protected] " " |
482 | [email protected] "1" | 475 | [email protected] |
483 | [email protected] " " | 476 | [email protected] "{" |
484 | [email protected] "=>" | 477 | [email protected] "\n ..." |
485 | [email protected] " " | 478 | [email protected] |
486 | [email protected] | 479 | [email protected] "if" |
487 | [email protected] | 480 | [email protected] " " |
488 | [email protected] "{" | 481 | [email protected] |
489 | [email protected] "\n ..." | 482 | [email protected] |
490 | [email protected] | 483 | [email protected] "(" |
491 | [email protected] "if" | 484 | [email protected] |
492 | [email protected] " " | 485 | [email protected] "return" |
493 | [email protected] | 486 | [email protected] ")" |
494 | [email protected] | 487 | [email protected] " " |
495 | [email protected] "(" | 488 | [email protected] |
496 | [email protected] | 489 | [email protected] "{" |
497 | [email protected] "return" | 490 | [email protected] "\n ..." |
498 | [email protected] ")" | 491 | [email protected] |
499 | [email protected] " " | 492 | [email protected] "return" |
500 | [email protected] | 493 | [email protected] "\n ..." |
501 | [email protected] | 494 | [email protected] "}" |
502 | [email protected] "{" | 495 | [email protected] " " |
503 | [email protected] "\n ..." | 496 | [email protected] "else" |
504 | [email protected] | 497 | [email protected] " " |
505 | [email protected] "return" | 498 | [email protected] |
506 | [email protected] "\n ..." | 499 | [email protected] "{" |
507 | [email protected] "}" | 500 | [email protected] "\n ..." |
508 | [email protected] " " | 501 | [email protected] |
509 | [email protected] "else" | 502 | [email protected] "return" |
510 | [email protected] " " | 503 | [email protected] "\n ..." |
511 | [email protected] | 504 | [email protected] "}" |
512 | [email protected] | 505 | [email protected] "\n " |
513 | [email protected] "{" | 506 | [email protected] "}" |
514 | [email protected] "\n ..." | 507 | [email protected] "\n " |
515 | [email protected] | 508 | [email protected] |
516 | [email protected] "return" | 509 | [email protected] |
517 | [email protected] "\n ..." | 510 | [email protected] "_" |
518 | [email protected] "}" | 511 | [email protected] " " |
519 | [email protected] "\n " | 512 | [email protected] "=>" |
520 | [email protected] "}" | 513 | [email protected] " " |
521 | [email protected] "\n " | 514 | [email protected] |
522 | [email protected] | 515 | [email protected] "{" |
523 | [email protected] | 516 | [email protected] " " |
524 | [email protected] "_" | 517 | [email protected] |
525 | [email protected] " " | 518 | [email protected] "return" |
526 | [email protected] "=>" | 519 | [email protected] " " |
527 | [email protected] " " | 520 | [email protected] "}" |
528 | [email protected] | 521 | [email protected] "\n " |
529 | [email protected] | 522 | [email protected] "}" |
530 | [email protected] "{" | 523 | [email protected] ";" |
531 | [email protected] " " | 524 | [email protected] "\n " |
532 | [email protected] | 525 | [email protected] "}" |
533 | [email protected] "return" | 526 | [email protected] " " |
534 | [email protected] " " | 527 | [email protected] "else" |
535 | [email protected] "}" | 528 | [email protected] " " |
536 | [email protected] "\n " | 529 | [email protected] |
537 | [email protected] "}" | 530 | [email protected] "if" |
538 | [email protected] ";" | 531 | [email protected] " " |
539 | [email protected] "\n " | 532 | [email protected] |
540 | [email protected] "}" | 533 | [email protected] |
541 | [email protected] " " | 534 | [email protected] "(" |
542 | [email protected] "else" | 535 | [email protected] |
543 | [email protected] " " | 536 | [email protected] "return" |
544 | [email protected] | 537 | [email protected] ")" |
545 | [email protected] "if" | 538 | [email protected] " " |
546 | [email protected] " " | 539 | [email protected] |
547 | [email protected] | 540 | [email protected] "{" |
548 | [email protected] | 541 | [email protected] "\n " |
549 | [email protected] "(" | 542 | [email protected] |
550 | [email protected] | 543 | [email protected] |
551 | [email protected] "return" | 544 | [email protected] "return" |
552 | [email protected] ")" | 545 | [email protected] ";" |
553 | [email protected] " " | 546 | [email protected] "\n " |
554 | [email protected] | 547 | [email protected] "}" |
555 | [email protected] | 548 | [email protected] "\n " |
556 | [email protected] "{" | 549 | [email protected] "}" |
557 | [email protected] "\n " | 550 | [email protected] "\n " |
558 | [email protected] | 551 | [email protected] |
559 | [email protected] | 552 | [email protected] "if" |
560 | [email protected] "return" | 553 | [email protected] " " |
561 | [email protected] ";" | 554 | [email protected] |
562 | [email protected] "\n " | 555 | [email protected] |
563 | [email protected] "}" | 556 | [email protected] "(" |
564 | [email protected] "\n " | 557 | [email protected] |
565 | [email protected] "}" | 558 | [email protected] "return" |
566 | [email protected] "\n " | 559 | [email protected] ")" |
567 | [email protected] | 560 | [email protected] " " |
568 | [email protected] "if" | 561 | [email protected] |
569 | [email protected] " " | 562 | [email protected] "{" |
570 | [email protected] | 563 | [email protected] " " |
571 | [email protected] | 564 | [email protected] |
572 | [email protected] "(" | 565 | [email protected] |
573 | [email protected] | 566 | [email protected] "break" |
574 | [email protected] "return" | 567 | [email protected] ";" |
575 | [email protected] ")" | 568 | [email protected] " " |
576 | [email protected] " " | 569 | [email protected] "}" |
577 | [email protected] | 570 | [email protected] "\n " |
578 | [email protected] | 571 | [email protected] "}" |
579 | [email protected] "{" | 572 | [email protected] "\n" |
580 | [email protected] " " | 573 | [email protected] "}" |
581 | [email protected] | ||
582 | [email protected] | ||
583 | [email protected] "break" | ||
584 | [email protected] ";" | ||
585 | [email protected] " " | ||
586 | [email protected] "}" | ||
587 | [email protected] "\n " | ||
588 | [email protected] "}" | ||
589 | [email protected] "\n" | ||
590 | [email protected] "}" | ||
591 | [email protected] "\n\n" | 574 | [email protected] "\n\n" |
592 | [email protected] | 575 | [email protected] |
593 | [email protected] "fn" | 576 | [email protected] "fn" |
@@ -599,233 +582,232 @@ [email protected] | |||
599 | [email protected] ")" | 582 | [email protected] ")" |
600 | [email protected] " " | 583 | [email protected] " " |
601 | [email protected] | 584 | [email protected] |
602 | [email protected] | 585 | [email protected] "{" |
603 | [email protected] "{" | 586 | [email protected] "\n " |
604 | [email protected] "\n " | 587 | [email protected] |
605 | [email protected] | 588 | [email protected] "let" |
606 | [email protected] "let" | 589 | [email protected] " " |
607 | [email protected] " " | 590 | [email protected] |
608 | [email protected] | 591 | [email protected] "mut" |
609 | [email protected] "mut" | 592 | [email protected] " " |
610 | [email protected] " " | 593 | [email protected] |
611 | [email protected] | 594 | [email protected] "_x" |
612 | [email protected] "_x" | 595 | [email protected] ":" |
613 | [email protected] ":" | 596 | [email protected] " " |
614 | [email protected] " " | 597 | [email protected] |
615 | [email protected] | 598 | [email protected] |
616 | [email protected] | 599 | [email protected] |
617 | [email protected] | 600 | [email protected] |
618 | [email protected] | 601 | [email protected] "isize" |
619 | [email protected] "isize" | 602 | [email protected] ";" |
620 | [email protected] ";" | 603 | [email protected] "\n " |
621 | [email protected] "\n " | 604 | [email protected] |
622 | [email protected] | 605 | [email protected] "let" |
623 | [email protected] "let" | 606 | [email protected] " " |
624 | [email protected] " " | 607 | [email protected] |
625 | [email protected] | 608 | [email protected] "mut" |
626 | [email protected] "mut" | 609 | [email protected] " " |
627 | [email protected] " " | 610 | [email protected] |
628 | [email protected] | 611 | [email protected] "_y" |
629 | [email protected] "_y" | 612 | [email protected] " " |
630 | [email protected] " " | 613 | [email protected] "=" |
631 | [email protected] "=" | 614 | [email protected] " " |
632 | [email protected] " " | 615 | [email protected] |
633 | [email protected] | 616 | [email protected] |
634 | [email protected] | 617 | [email protected] "(" |
635 | [email protected] "(" | 618 | [email protected] |
636 | [email protected] | 619 | [email protected] |
637 | [email protected] | 620 | [email protected] |
638 | [email protected] | 621 | [email protected] |
639 | [email protected] | 622 | [email protected] |
640 | [email protected] | 623 | [email protected] "_x" |
641 | [email protected] "_x" | 624 | [email protected] " " |
642 | [email protected] " " | 625 | [email protected] "=" |
643 | [email protected] "=" | 626 | [email protected] " " |
644 | [email protected] " " | 627 | [email protected] |
645 | [email protected] | 628 | [email protected] "0" |
646 | [email protected] "0" | 629 | [email protected] ")" |
647 | [email protected] ")" | 630 | [email protected] " " |
648 | [email protected] " " | 631 | [email protected] "==" |
649 | [email protected] "==" | 632 | [email protected] " " |
650 | [email protected] " " | 633 | [email protected] |
651 | [email protected] | 634 | [email protected] "(" |
652 | [email protected] "(" | 635 | [email protected] |
653 | [email protected] | 636 | [email protected] |
654 | [email protected] | 637 | [email protected] |
655 | [email protected] | 638 | [email protected] |
656 | [email protected] | 639 | [email protected] |
657 | [email protected] | 640 | [email protected] "_x" |
658 | [email protected] "_x" | 641 | [email protected] " " |
659 | [email protected] " " | 642 | [email protected] "=" |
660 | [email protected] "=" | 643 | [email protected] " " |
661 | [email protected] " " | 644 | [email protected] |
662 | [email protected] | 645 | [email protected] "0" |
663 | [email protected] "0" | 646 | [email protected] ")" |
664 | [email protected] ")" | 647 | [email protected] ";" |
665 | [email protected] ";" | 648 | [email protected] "\n " |
666 | [email protected] "\n " | 649 | [email protected] |
667 | [email protected] | 650 | [email protected] "let" |
668 | [email protected] "let" | 651 | [email protected] " " |
669 | [email protected] " " | 652 | [email protected] |
670 | [email protected] | 653 | [email protected] "mut" |
671 | [email protected] "mut" | 654 | [email protected] " " |
672 | [email protected] " " | 655 | [email protected] |
673 | [email protected] | 656 | [email protected] "_z" |
674 | [email protected] "_z" | 657 | [email protected] " " |
675 | [email protected] " " | 658 | [email protected] "=" |
676 | [email protected] "=" | 659 | [email protected] " " |
677 | [email protected] " " | 660 | [email protected] |
678 | [email protected] | 661 | [email protected] |
679 | [email protected] | 662 | [email protected] "(" |
680 | [email protected] "(" | 663 | [email protected] |
681 | [email protected] | 664 | [email protected] |
682 | [email protected] | 665 | [email protected] |
683 | [email protected] | 666 | [email protected] |
684 | [email protected] | 667 | [email protected] |
685 | [email protected] | 668 | [email protected] "_x" |
686 | [email protected] "_x" | 669 | [email protected] " " |
687 | [email protected] " " | 670 | [email protected] "=" |
688 | [email protected] "=" | 671 | [email protected] " " |
689 | [email protected] " " | 672 | [email protected] |
690 | [email protected] | 673 | [email protected] "0" |
691 | [email protected] "0" | 674 | [email protected] ")" |
692 | [email protected] ")" | 675 | [email protected] " " |
693 | [email protected] " " | 676 | [email protected] "<" |
694 | [email protected] "<" | 677 | [email protected] " " |
695 | [email protected] " " | 678 | [email protected] |
696 | [email protected] | 679 | [email protected] "(" |
697 | [email protected] "(" | 680 | [email protected] |
698 | [email protected] | 681 | [email protected] |
699 | [email protected] | 682 | [email protected] |
700 | [email protected] | 683 | [email protected] |
701 | [email protected] | 684 | [email protected] |
702 | [email protected] | 685 | [email protected] "_x" |
703 | [email protected] "_x" | 686 | [email protected] " " |
704 | [email protected] " " | 687 | [email protected] "=" |
705 | [email protected] "=" | 688 | [email protected] " " |
706 | [email protected] " " | 689 | [email protected] |
707 | [email protected] | 690 | [email protected] "0" |
708 | [email protected] "0" | 691 | [email protected] ")" |
709 | [email protected] ")" | 692 | [email protected] ";" |
710 | [email protected] ";" | 693 | [email protected] "\n " |
711 | [email protected] "\n " | 694 | [email protected] |
712 | [email protected] | 695 | [email protected] "let" |
713 | [email protected] "let" | 696 | [email protected] " " |
714 | [email protected] " " | 697 | [email protected] |
715 | [email protected] | 698 | [email protected] |
716 | [email protected] | 699 | [email protected] "_a" |
717 | [email protected] "_a" | 700 | [email protected] " " |
718 | [email protected] " " | 701 | [email protected] "=" |
719 | [email protected] "=" | 702 | [email protected] " " |
720 | [email protected] " " | 703 | [email protected] |
721 | [email protected] | 704 | [email protected] |
722 | [email protected] | 705 | [email protected] "(" |
723 | [email protected] "(" | 706 | [email protected] |
724 | [email protected] | 707 | [email protected] |
725 | [email protected] | 708 | [email protected] |
726 | [email protected] | 709 | [email protected] |
727 | [email protected] | 710 | [email protected] |
728 | [email protected] | 711 | [email protected] "_x" |
729 | [email protected] "_x" | 712 | [email protected] " " |
730 | [email protected] " " | 713 | [email protected] "+=" |
731 | [email protected] "+=" | 714 | [email protected] " " |
732 | [email protected] " " | 715 | [email protected] |
733 | [email protected] | 716 | [email protected] "0" |
734 | [email protected] "0" | 717 | [email protected] ")" |
735 | [email protected] ")" | 718 | [email protected] " " |
736 | [email protected] " " | 719 | [email protected] "==" |
737 | [email protected] "==" | 720 | [email protected] " " |
738 | [email protected] " " | 721 | [email protected] |
739 | [email protected] | 722 | [email protected] "(" |
740 | [email protected] "(" | 723 | [email protected] |
741 | [email protected] | 724 | [email protected] |
742 | [email protected] | 725 | [email protected] |
743 | [email protected] | 726 | [email protected] |
744 | [email protected] | 727 | [email protected] |
745 | [email protected] | 728 | [email protected] "_x" |
746 | [email protected] "_x" | 729 | [email protected] " " |
747 | [email protected] " " | 730 | [email protected] "=" |
748 | [email protected] "=" | 731 | [email protected] " " |
749 | [email protected] " " | 732 | [email protected] |
750 | [email protected] | 733 | [email protected] "0" |
751 | [email protected] "0" | 734 | [email protected] ")" |
752 | [email protected] ")" | 735 | [email protected] ";" |
753 | [email protected] ";" | 736 | [email protected] "\n " |
754 | [email protected] "\n " | 737 | [email protected] |
755 | [email protected] | 738 | [email protected] "let" |
756 | [email protected] "let" | 739 | [email protected] " " |
757 | [email protected] " " | 740 | [email protected] |
758 | [email protected] | 741 | [email protected] |
759 | [email protected] | 742 | [email protected] "_b" |
760 | [email protected] "_b" | 743 | [email protected] " " |
761 | [email protected] " " | 744 | [email protected] "=" |
762 | [email protected] "=" | 745 | [email protected] " " |
763 | [email protected] " " | 746 | [email protected] |
764 | [email protected] | 747 | [email protected] |
765 | [email protected] | 748 | [email protected] |
766 | [email protected] | 749 | [email protected] |
767 | [email protected] | 750 | [email protected] |
768 | [email protected] | 751 | [email protected] |
769 | [email protected] | 752 | [email protected] "swap" |
770 | [email protected] "swap" | 753 | [email protected] |
771 | [email protected] | 754 | [email protected] "(" |
772 | [email protected] "(" | 755 | [email protected] |
773 | [email protected] | 756 | [email protected] "&" |
774 | [email protected] "&" | 757 | [email protected] "mut" |
775 | [email protected] "mut" | 758 | [email protected] " " |
776 | [email protected] " " | 759 | [email protected] |
777 | [email protected] | 760 | [email protected] |
778 | [email protected] | 761 | [email protected] |
779 | [email protected] | 762 | [email protected] |
780 | [email protected] | 763 | [email protected] "_y" |
781 | [email protected] "_y" | 764 | [email protected] "," |
782 | [email protected] "," | 765 | [email protected] " " |
783 | [email protected] " " | 766 | [email protected] |
784 | [email protected] | 767 | [email protected] "&" |
785 | [email protected] "&" | 768 | [email protected] "mut" |
786 | [email protected] "mut" | 769 | [email protected] " " |
787 | [email protected] " " | 770 | [email protected] |
788 | [email protected] | 771 | [email protected] |
789 | [email protected] | 772 | [email protected] |
790 | [email protected] | 773 | [email protected] |
791 | [email protected] | 774 | [email protected] "_z" |
792 | [email protected] "_z" | 775 | [email protected] ")" |
793 | [email protected] ")" | 776 | [email protected] " " |
794 | [email protected] " " | 777 | [email protected] "==" |
795 | [email protected] "==" | 778 | [email protected] " " |
796 | [email protected] " " | 779 | [email protected] |
797 | [email protected] | 780 | [email protected] |
798 | [email protected] | 781 | [email protected] |
799 | [email protected] | 782 | [email protected] |
800 | [email protected] | 783 | [email protected] |
801 | [email protected] | 784 | [email protected] "swap" |
802 | [email protected] "swap" | 785 | [email protected] |
803 | [email protected] | 786 | [email protected] "(" |
804 | [email protected] "(" | 787 | [email protected] |
805 | [email protected] | 788 | [email protected] "&" |
806 | [email protected] "&" | 789 | [email protected] "mut" |
807 | [email protected] "mut" | 790 | [email protected] " " |
808 | [email protected] " " | 791 | [email protected] |
809 | [email protected] | 792 | [email protected] |
810 | [email protected] | 793 | [email protected] |
811 | [email protected] | 794 | [email protected] |
812 | [email protected] | 795 | [email protected] "_y" |
813 | [email protected] "_y" | 796 | [email protected] "," |
814 | [email protected] "," | 797 | [email protected] " " |
815 | [email protected] " " | 798 | [email protected] |
816 | [email protected] | 799 | [email protected] "&" |
817 | [email protected] "&" | 800 | [email protected] "mut" |
818 | [email protected] "mut" | 801 | [email protected] " " |
819 | [email protected] " " | 802 | [email protected] |
820 | [email protected] | 803 | [email protected] |
821 | [email protected] | 804 | [email protected] |
822 | [email protected] | 805 | [email protected] |
823 | [email protected] | 806 | [email protected] "_z" |
824 | [email protected] "_z" | 807 | [email protected] ")" |
825 | [email protected] ")" | 808 | [email protected] ";" |
826 | [email protected] ";" | 809 | [email protected] "\n" |
827 | [email protected] "\n" | 810 | [email protected] "}" |
828 | [email protected] "}" | ||
829 | [email protected] "\n\n" | 811 | [email protected] "\n\n" |
830 | [email protected] | 812 | [email protected] |
831 | [email protected] "fn" | 813 | [email protected] "fn" |
@@ -846,167 +828,165 @@ [email protected] | |||
846 | [email protected] "usize" | 828 | [email protected] "usize" |
847 | [email protected] " " | 829 | [email protected] " " |
848 | [email protected] | 830 | [email protected] |
849 | [email protected] | 831 | [email protected] "{" |
850 | [email protected] "{" | 832 | [email protected] "\n " |
851 | [email protected] "\n " | 833 | [email protected] |
852 | [email protected] | 834 | [email protected] "fn" |
853 | [email protected] "fn" | 835 | [email protected] " " |
854 | [email protected] " " | 836 | [email protected] |
855 | [email protected] | 837 | [email protected] "p" |
856 | [email protected] "p" | 838 | [email protected] |
857 | [email protected] | 839 | [email protected] "(" |
858 | [email protected] "(" | 840 | [email protected] ")" |
859 | [email protected] ")" | 841 | [email protected] " " |
860 | [email protected] " " | 842 | [email protected] |
861 | [email protected] | 843 | [email protected] "->" |
862 | [email protected] "->" | 844 | [email protected] " " |
863 | [email protected] " " | 845 | [email protected] |
864 | [email protected] | 846 | [email protected] |
865 | [email protected] | 847 | [email protected] |
866 | [email protected] | 848 | [email protected] |
867 | [email protected] | 849 | [email protected] "bool" |
868 | [email protected] "bool" | 850 | [email protected] " " |
869 | [email protected] " " | 851 | [email protected] |
870 | [email protected] | 852 | [email protected] "{" |
871 | [email protected] | 853 | [email protected] " " |
872 | [email protected] "{" | 854 | [email protected] |
873 | [email protected] " " | 855 | [email protected] "true" |
874 | [email protected] | 856 | [email protected] " " |
875 | [email protected] "true" | 857 | [email protected] "}" |
876 | [email protected] " " | 858 | [email protected] "\n " |
877 | [email protected] "}" | 859 | [email protected] |
878 | [email protected] "\n " | 860 | [email protected] "let" |
879 | [email protected] | 861 | [email protected] " " |
880 | [email protected] "let" | 862 | [email protected] |
881 | [email protected] " " | 863 | [email protected] |
882 | [email protected] | 864 | [email protected] "_a" |
883 | [email protected] | 865 | [email protected] " " |
884 | [email protected] "_a" | 866 | [email protected] "=" |
885 | [email protected] " " | 867 | [email protected] " " |
886 | [email protected] "=" | 868 | [email protected] |
887 | [email protected] " " | 869 | [email protected] "(" |
888 | [email protected] | 870 | [email protected] |
889 | [email protected] "(" | 871 | [email protected] |
890 | [email protected] | 872 | [email protected] |
891 | [email protected] | 873 | [email protected] |
892 | [email protected] | 874 | [email protected] |
893 | [email protected] | 875 | [email protected] "assert" |
894 | [email protected] | 876 | [email protected] "!" |
895 | [email protected] "assert" | 877 | [email protected] |
896 | [email protected] "!" | 878 | [email protected] "(" |
897 | [email protected] | 879 | [email protected] |
898 | [email protected] "(" | 880 | [email protected] "(" |
899 | [email protected] | 881 | [email protected] "true" |
900 | [email protected] "(" | 882 | [email protected] ")" |
901 | [email protected] "true" | 883 | [email protected] ")" |
902 | [email protected] ")" | 884 | [email protected] " " |
903 | [email protected] ")" | 885 | [email protected] "==" |
904 | [email protected] " " | 886 | [email protected] " " |
905 | [email protected] "==" | 887 | [email protected] |
906 | [email protected] " " | 888 | [email protected] "(" |
907 | [email protected] | 889 | [email protected] |
908 | [email protected] "(" | 890 | [email protected] |
909 | [email protected] | 891 | [email protected] |
910 | [email protected] | 892 | [email protected] |
911 | [email protected] | 893 | [email protected] "assert" |
912 | [email protected] | 894 | [email protected] "!" |
913 | [email protected] "assert" | 895 | [email protected] |
914 | [email protected] "!" | 896 | [email protected] "(" |
915 | [email protected] | 897 | [email protected] "p" |
916 | [email protected] "(" | 898 | [email protected] |
917 | [email protected] "p" | 899 | [email protected] "(" |
918 | [email protected] | 900 | [email protected] ")" |
919 | [email protected] "(" | 901 | [email protected] ")" |
920 | [email protected] ")" | 902 | [email protected] ")" |
921 | [email protected] ")" | 903 | [email protected] ")" |
922 | [email protected] ")" | 904 | [email protected] ";" |
923 | [email protected] ")" | 905 | [email protected] "\n " |
924 | [email protected] ";" | 906 | [email protected] |
925 | [email protected] "\n " | 907 | [email protected] "let" |
926 | [email protected] | 908 | [email protected] " " |
927 | [email protected] "let" | 909 | [email protected] |
928 | [email protected] " " | 910 | [email protected] |
929 | [email protected] | 911 | [email protected] "_c" |
930 | [email protected] | 912 | [email protected] " " |
931 | [email protected] "_c" | 913 | [email protected] "=" |
932 | [email protected] " " | 914 | [email protected] " " |
933 | [email protected] "=" | 915 | [email protected] |
934 | [email protected] " " | 916 | [email protected] "(" |
935 | [email protected] | 917 | [email protected] |
936 | [email protected] "(" | 918 | [email protected] |
937 | [email protected] | 919 | [email protected] |
938 | [email protected] | 920 | [email protected] |
939 | [email protected] | 921 | [email protected] |
940 | [email protected] | 922 | [email protected] "assert" |
941 | [email protected] | 923 | [email protected] "!" |
942 | [email protected] "assert" | 924 | [email protected] |
943 | [email protected] "!" | 925 | [email protected] "(" |
944 | [email protected] | 926 | [email protected] |
945 | [email protected] "(" | 927 | [email protected] "(" |
946 | [email protected] | 928 | [email protected] "p" |
947 | [email protected] "(" | 929 | [email protected] |
948 | [email protected] "p" | 930 | [email protected] "(" |
949 | [email protected] | 931 | [email protected] ")" |
950 | [email protected] "(" | 932 | [email protected] ")" |
951 | [email protected] ")" | 933 | [email protected] ")" |
952 | [email protected] ")" | 934 | [email protected] " " |
953 | [email protected] ")" | 935 | [email protected] "==" |
954 | [email protected] " " | 936 | [email protected] " " |
955 | [email protected] "==" | 937 | [email protected] |
956 | [email protected] " " | 938 | [email protected] "(" |
957 | [email protected] | 939 | [email protected] ")" |
958 | [email protected] "(" | 940 | [email protected] ")" |
959 | [email protected] ")" | 941 | [email protected] ";" |
960 | [email protected] ")" | 942 | [email protected] "\n " |
961 | [email protected] ";" | 943 | [email protected] |
962 | [email protected] "\n " | 944 | [email protected] "let" |
963 | [email protected] | 945 | [email protected] " " |
964 | [email protected] "let" | 946 | [email protected] |
965 | [email protected] " " | 947 | [email protected] |
966 | [email protected] | 948 | [email protected] "_b" |
967 | [email protected] | 949 | [email protected] ":" |
968 | [email protected] "_b" | 950 | [email protected] " " |
969 | [email protected] ":" | 951 | [email protected] |
970 | [email protected] " " | 952 | [email protected] |
971 | [email protected] | 953 | [email protected] |
972 | [email protected] | 954 | [email protected] |
973 | [email protected] | 955 | [email protected] "bool" |
974 | [email protected] | 956 | [email protected] " " |
975 | [email protected] "bool" | 957 | [email protected] "=" |
976 | [email protected] " " | 958 | [email protected] " " |
977 | [email protected] "=" | 959 | [email protected] |
978 | [email protected] " " | 960 | [email protected] "(" |
979 | [email protected] | 961 | [email protected] |
980 | [email protected] "(" | 962 | [email protected] |
981 | [email protected] | 963 | [email protected] |
982 | [email protected] | 964 | [email protected] |
983 | [email protected] | 965 | [email protected] |
984 | [email protected] | 966 | [email protected] "println" |
985 | [email protected] | 967 | [email protected] "!" |
986 | [email protected] "println" | 968 | [email protected] |
987 | [email protected] "!" | 969 | [email protected] "(" |
988 | [email protected] | 970 | [email protected] "\"{}\"" |
989 | [email protected] "(" | 971 | [email protected] "," |
990 | [email protected] "\"{}\"" | 972 | [email protected] " " |
991 | [email protected] "," | 973 | [email protected] "0" |
992 | [email protected] " " | 974 | [email protected] ")" |
993 | [email protected] "0" | 975 | [email protected] " " |
994 | [email protected] ")" | 976 | [email protected] "==" |
995 | [email protected] " " | 977 | [email protected] " " |
996 | [email protected] "==" | 978 | [email protected] |
997 | [email protected] " " | 979 | [email protected] "(" |
998 | [email protected] | 980 | [email protected] |
999 | [email protected] "(" | 981 | [email protected] "return" |
1000 | [email protected] | 982 | [email protected] " " |
1001 | [email protected] "return" | 983 | [email protected] |
1002 | [email protected] " " | 984 | [email protected] "0" |
1003 | [email protected] | 985 | [email protected] ")" |
1004 | [email protected] "0" | 986 | [email protected] ")" |
1005 | [email protected] ")" | 987 | [email protected] ";" |
1006 | [email protected] ")" | 988 | [email protected] "\n" |
1007 | [email protected] ";" | 989 | [email protected] "}" |
1008 | [email protected] "\n" | ||
1009 | [email protected] "}" | ||
1010 | [email protected] "\n\n" | 990 | [email protected] "\n\n" |
1011 | [email protected] | 991 | [email protected] |
1012 | [email protected] "fn" | 992 | [email protected] "fn" |
@@ -1018,144 +998,138 @@ [email protected] | |||
1018 | [email protected] ")" | 998 | [email protected] ")" |
1019 | [email protected] " " | 999 | [email protected] " " |
1020 | [email protected] | 1000 | [email protected] |
1021 | [email protected] | 1001 | [email protected] "{" |
1022 | [email protected] "{" | 1002 | [email protected] "\n " |
1023 | [email protected] "\n " | 1003 | [email protected] |
1024 | [email protected] | 1004 | [email protected] |
1025 | [email protected] | 1005 | [email protected] "loop" |
1026 | [email protected] "loop" | 1006 | [email protected] " " |
1027 | [email protected] " " | 1007 | [email protected] |
1028 | [email protected] | 1008 | [email protected] "{" |
1029 | [email protected] | 1009 | [email protected] " " |
1030 | [email protected] "{" | 1010 | [email protected] |
1031 | [email protected] " " | 1011 | [email protected] "if" |
1032 | [email protected] | 1012 | [email protected] " " |
1033 | [email protected] "if" | 1013 | [email protected] |
1034 | [email protected] " " | 1014 | [email protected] |
1035 | [email protected] | 1015 | [email protected] "break" |
1036 | [email protected] | 1016 | [email protected] " " |
1037 | [email protected] "break" | 1017 | [email protected] |
1038 | [email protected] " " | 1018 | [email protected] "{" |
1039 | [email protected] | 1019 | [email protected] " " |
1040 | [email protected] | 1020 | [email protected] "}" |
1041 | [email protected] "{" | 1021 | [email protected] " " |
1042 | [email protected] " " | 1022 | [email protected] "}" |
1043 | [email protected] "}" | 1023 | [email protected] "\n " |
1044 | [email protected] " " | 1024 | [email protected] |
1045 | [email protected] "}" | 1025 | [email protected] "let" |
1046 | [email protected] "\n " | 1026 | [email protected] " " |
1047 | [email protected] | 1027 | [email protected] |
1048 | [email protected] "let" | 1028 | [email protected] "mut" |
1049 | [email protected] " " | 1029 | [email protected] " " |
1050 | [email protected] | 1030 | [email protected] |
1051 | [email protected] "mut" | 1031 | [email protected] "i" |
1052 | [email protected] " " | 1032 | [email protected] " " |
1053 | [email protected] | 1033 | [email protected] "=" |
1054 | [email protected] "i" | 1034 | [email protected] " " |
1055 | [email protected] " " | 1035 | [email protected] |
1056 | [email protected] "=" | 1036 | [email protected] "0" |
1057 | [email protected] " " | 1037 | [email protected] ";" |
1058 | [email protected] | 1038 | [email protected] "\n " |
1059 | [email protected] "0" | 1039 | [email protected] |
1060 | [email protected] ";" | 1040 | [email protected] "loop" |
1061 | [email protected] "\n " | 1041 | [email protected] " " |
1062 | [email protected] | 1042 | [email protected] |
1063 | [email protected] "loop" | 1043 | [email protected] "{" |
1064 | [email protected] " " | 1044 | [email protected] " " |
1065 | [email protected] | 1045 | [email protected] |
1066 | [email protected] | 1046 | [email protected] |
1067 | [email protected] "{" | 1047 | [email protected] |
1068 | [email protected] " " | 1048 | [email protected] |
1069 | [email protected] | 1049 | [email protected] |
1070 | [email protected] | 1050 | [email protected] |
1071 | [email protected] | 1051 | [email protected] "i" |
1072 | [email protected] | 1052 | [email protected] " " |
1073 | [email protected] | 1053 | [email protected] "+=" |
1074 | [email protected] | 1054 | [email protected] " " |
1075 | [email protected] "i" | 1055 | [email protected] |
1076 | [email protected] " " | 1056 | [email protected] "1" |
1077 | [email protected] "+=" | 1057 | [email protected] ";" |
1078 | [email protected] " " | 1058 | [email protected] " " |
1079 | [email protected] | 1059 | [email protected] |
1080 | [email protected] "1" | 1060 | [email protected] |
1081 | [email protected] ";" | 1061 | [email protected] "if" |
1082 | [email protected] " " | 1062 | [email protected] " " |
1083 | [email protected] | 1063 | [email protected] |
1084 | [email protected] | 1064 | [email protected] |
1085 | [email protected] "if" | 1065 | [email protected] |
1086 | [email protected] " " | 1066 | [email protected] |
1087 | [email protected] | 1067 | [email protected] |
1088 | [email protected] | 1068 | [email protected] |
1089 | [email protected] | 1069 | [email protected] "i" |
1090 | [email protected] | 1070 | [email protected] " " |
1091 | [email protected] | 1071 | [email protected] "==" |
1092 | [email protected] | 1072 | [email protected] " " |
1093 | [email protected] "i" | 1073 | [email protected] |
1094 | [email protected] " " | 1074 | [email protected] "1" |
1095 | [email protected] "==" | 1075 | [email protected] " " |
1096 | [email protected] " " | 1076 | [email protected] |
1097 | [email protected] | 1077 | [email protected] "{" |
1098 | [email protected] "1" | 1078 | [email protected] " " |
1099 | [email protected] " " | 1079 | [email protected] |
1100 | [email protected] | 1080 | [email protected] "match" |
1101 | [email protected] | 1081 | [email protected] " " |
1102 | [email protected] "{" | 1082 | [email protected] |
1103 | [email protected] " " | 1083 | [email protected] "(" |
1104 | [email protected] | 1084 | [email protected] |
1105 | [email protected] "match" | 1085 | [email protected] "continue" |
1106 | [email protected] " " | 1086 | [email protected] ")" |
1107 | [email protected] | 1087 | [email protected] " " |
1108 | [email protected] "(" | 1088 | [email protected] |
1109 | [email protected] | 1089 | [email protected] "{" |
1110 | [email protected] "continue" | 1090 | [email protected] " " |
1111 | [email protected] ")" | 1091 | [email protected] |
1112 | [email protected] " " | 1092 | [email protected] |
1113 | [email protected] | 1093 | [email protected] |
1114 | [email protected] "{" | 1094 | [email protected] "1" |
1115 | [email protected] " " | 1095 | [email protected] " " |
1116 | [email protected] | 1096 | [email protected] "=>" |
1117 | [email protected] | 1097 | [email protected] " " |
1118 | [email protected] | 1098 | [email protected] |
1119 | [email protected] "1" | 1099 | [email protected] "{" |
1120 | [email protected] " " | 1100 | [email protected] " " |
1121 | [email protected] "=>" | 1101 | [email protected] "}" |
1122 | [email protected] " " | 1102 | [email protected] "," |
1123 | [email protected] | 1103 | [email protected] " " |
1124 | [email protected] | 1104 | [email protected] |
1125 | [email protected] "{" | 1105 | [email protected] |
1126 | [email protected] " " | 1106 | [email protected] "_" |
1127 | [email protected] "}" | 1107 | [email protected] " " |
1128 | [email protected] "," | 1108 | [email protected] "=>" |
1129 | [email protected] " " | 1109 | [email protected] " " |
1130 | [email protected] | 1110 | [email protected] |
1131 | [email protected] | 1111 | [email protected] |
1132 | [email protected] "_" | 1112 | [email protected] |
1133 | [email protected] " " | 1113 | [email protected] |
1134 | [email protected] "=>" | 1114 | [email protected] "panic" |
1135 | [email protected] " " | 1115 | [email protected] "!" |
1136 | [email protected] | 1116 | [email protected] |
1137 | [email protected] | 1117 | [email protected] "(" |
1138 | [email protected] | 1118 | [email protected] "\"wat\"" |
1139 | [email protected] | 1119 | [email protected] ")" |
1140 | [email protected] "panic" | 1120 | [email protected] " " |
1141 | [email protected] "!" | 1121 | [email protected] "}" |
1142 | [email protected] | 1122 | [email protected] " " |
1143 | [email protected] "(" | 1123 | [email protected] "}" |
1144 | [email protected] "\"wat\"" | 1124 | [email protected] "\n " |
1145 | [email protected] ")" | 1125 | [email protected] |
1146 | [email protected] " " | 1126 | [email protected] |
1147 | [email protected] "}" | 1127 | [email protected] "break" |
1148 | [email protected] " " | 1128 | [email protected] ";" |
1149 | [email protected] "}" | 1129 | [email protected] " " |
1150 | [email protected] "\n " | 1130 | [email protected] "}" |
1151 | [email protected] | 1131 | [email protected] "\n" |
1152 | [email protected] | 1132 | [email protected] "}" |
1153 | [email protected] "break" | ||
1154 | [email protected] ";" | ||
1155 | [email protected] " " | ||
1156 | [email protected] "}" | ||
1157 | [email protected] "\n" | ||
1158 | [email protected] "}" | ||
1159 | [email protected] "\n\n" | 1133 | [email protected] "\n\n" |
1160 | [email protected] | 1134 | [email protected] |
1161 | [email protected] "fn" | 1135 | [email protected] "fn" |
@@ -1167,31 +1141,30 @@ [email protected] | |||
1167 | [email protected] ")" | 1141 | [email protected] ")" |
1168 | [email protected] " " | 1142 | [email protected] " " |
1169 | [email protected] | 1143 | [email protected] |
1170 | [email protected] | 1144 | [email protected] "{" |
1171 | [email protected] "{" | 1145 | [email protected] " " |
1172 | [email protected] " " | 1146 | [email protected] |
1173 | [email protected] | 1147 | [email protected] "let" |
1174 | [email protected] "let" | 1148 | [email protected] " " |
1175 | [email protected] " " | 1149 | [email protected] |
1176 | [email protected] | 1150 | [email protected] |
1177 | [email protected] | 1151 | [email protected] "_evil" |
1178 | [email protected] "_evil" | 1152 | [email protected] " " |
1179 | [email protected] " " | 1153 | [email protected] "=" |
1180 | [email protected] "=" | 1154 | [email protected] " " |
1181 | [email protected] " " | 1155 | [email protected] |
1182 | [email protected] | 1156 | [email protected] |
1183 | [email protected] | 1157 | [email protected] |
1184 | [email protected] | 1158 | [email protected] |
1185 | [email protected] | 1159 | [email protected] "println" |
1186 | [email protected] "println" | 1160 | [email protected] "!" |
1187 | [email protected] "!" | 1161 | [email protected] |
1188 | [email protected] | 1162 | [email protected] "(" |
1189 | [email protected] "(" | 1163 | [email protected] "\"lincoln\"" |
1190 | [email protected] "\"lincoln\"" | 1164 | [email protected] ")" |
1191 | [email protected] ")" | 1165 | [email protected] ";" |
1192 | [email protected] ";" | 1166 | [email protected] " " |
1193 | [email protected] " " | 1167 | [email protected] "}" |
1194 | [email protected] "}" | ||
1195 | [email protected] "\n\n" | 1168 | [email protected] "\n\n" |
1196 | [email protected] | 1169 | [email protected] |
1197 | [email protected] "fn" | 1170 | [email protected] "fn" |
@@ -1203,114 +1176,113 @@ [email protected] | |||
1203 | [email protected] ")" | 1176 | [email protected] ")" |
1204 | [email protected] " " | 1177 | [email protected] " " |
1205 | [email protected] | 1178 | [email protected] |
1206 | [email protected] | 1179 | [email protected] "{" |
1207 | [email protected] "{" | 1180 | [email protected] "\n " |
1208 | [email protected] "\n " | 1181 | [email protected] |
1209 | [email protected] | 1182 | [email protected] |
1210 | [email protected] | 1183 | [email protected] |
1211 | [email protected] | 1184 | [email protected] |
1212 | [email protected] | 1185 | [email protected] |
1213 | [email protected] | 1186 | [email protected] "assert_eq" |
1214 | [email protected] "assert_eq" | 1187 | [email protected] "!" |
1215 | [email protected] "!" | 1188 | [email protected] |
1216 | [email protected] | 1189 | [email protected] "(" |
1217 | [email protected] "(" | 1190 | [email protected] "String" |
1218 | [email protected] "String" | 1191 | [email protected] ":" |
1219 | [email protected] ":" | 1192 | [email protected] ":" |
1220 | [email protected] ":" | 1193 | [email protected] "from" |
1221 | [email protected] "from" | 1194 | [email protected] |
1222 | [email protected] | 1195 | [email protected] "(" |
1223 | [email protected] "(" | 1196 | [email protected] "\".................... ..." |
1224 | [email protected] "\".................... ..." | 1197 | [email protected] ")" |
1225 | [email protected] ")" | 1198 | [email protected] "," |
1226 | [email protected] "," | 1199 | [email protected] "\n " |
1227 | [email protected] "\n " | 1200 | [email protected] "format" |
1228 | [email protected] "format" | 1201 | [email protected] "!" |
1229 | [email protected] "!" | 1202 | [email protected] |
1230 | [email protected] | 1203 | [email protected] "(" |
1231 | [email protected] "(" | 1204 | [email protected] "\"{:?}\"" |
1232 | [email protected] "\"{:?}\"" | 1205 | [email protected] "," |
1233 | [email protected] "," | 1206 | [email protected] " " |
1234 | [email protected] " " | 1207 | [email protected] "." |
1235 | [email protected] "." | 1208 | [email protected] "." |
1236 | [email protected] "." | 1209 | [email protected] " " |
1237 | [email protected] " " | 1210 | [email protected] "." |
1238 | [email protected] "." | 1211 | [email protected] "." |
1239 | [email protected] "." | 1212 | [email protected] " " |
1240 | [email protected] " " | 1213 | [email protected] "." |
1241 | [email protected] "." | 1214 | [email protected] "." |
1242 | [email protected] "." | 1215 | [email protected] " " |
1243 | [email protected] " " | 1216 | [email protected] "." |
1244 | [email protected] "." | 1217 | [email protected] "." |
1245 | [email protected] "." | 1218 | [email protected] " " |
1246 | [email protected] " " | 1219 | [email protected] "." |
1247 | [email protected] "." | 1220 | [email protected] "." |
1248 | [email protected] "." | 1221 | [email protected] " " |
1249 | [email protected] " " | 1222 | [email protected] "." |
1250 | [email protected] "." | 1223 | [email protected] "." |
1251 | [email protected] "." | 1224 | [email protected] " " |
1252 | [email protected] " " | 1225 | [email protected] "." |
1253 | [email protected] "." | 1226 | [email protected] "." |
1254 | [email protected] "." | 1227 | [email protected] " " |
1255 | [email protected] " " | 1228 | [email protected] "." |
1256 | [email protected] "." | 1229 | [email protected] "." |
1257 | [email protected] "." | 1230 | [email protected] " " |
1258 | [email protected] " " | 1231 | [email protected] "." |
1259 | [email protected] "." | 1232 | [email protected] "." |
1260 | [email protected] "." | 1233 | [email protected] " " |
1261 | [email protected] " " | 1234 | [email protected] "." |
1262 | [email protected] "." | 1235 | [email protected] "." |
1263 | [email protected] "." | 1236 | [email protected] " " |
1264 | [email protected] " " | 1237 | [email protected] "." |
1265 | [email protected] "." | 1238 | [email protected] "." |
1266 | [email protected] "." | 1239 | [email protected] " " |
1267 | [email protected] " " | 1240 | [email protected] "." |
1268 | [email protected] "." | 1241 | [email protected] "." |
1269 | [email protected] "." | 1242 | [email protected] " " |
1270 | [email protected] " " | 1243 | [email protected] "." |
1271 | [email protected] "." | 1244 | [email protected] "." |
1272 | [email protected] "." | 1245 | [email protected] "\n ..." |
1273 | [email protected] "\n ..." | 1246 | [email protected] "." |
1274 | [email protected] "." | 1247 | [email protected] "." |
1275 | [email protected] "." | 1248 | [email protected] " " |
1276 | [email protected] " " | 1249 | [email protected] "." |
1277 | [email protected] "." | 1250 | [email protected] "." |
1278 | [email protected] "." | 1251 | [email protected] " " |
1279 | [email protected] " " | 1252 | [email protected] "." |
1280 | [email protected] "." | 1253 | [email protected] "." |
1281 | [email protected] "." | 1254 | [email protected] " " |
1282 | [email protected] " " | 1255 | [email protected] "." |
1283 | [email protected] "." | 1256 | [email protected] "." |
1284 | [email protected] "." | 1257 | [email protected] " " |
1285 | [email protected] " " | 1258 | [email protected] "." |
1286 | [email protected] "." | 1259 | [email protected] "." |
1287 | [email protected] "." | 1260 | [email protected] " " |
1288 | [email protected] " " | 1261 | [email protected] "." |
1289 | [email protected] "." | 1262 | [email protected] "." |
1290 | [email protected] "." | 1263 | [email protected] " " |
1291 | [email protected] " " | 1264 | [email protected] "." |
1292 | [email protected] "." | 1265 | [email protected] "." |
1293 | [email protected] "." | 1266 | [email protected] " " |
1294 | [email protected] " " | 1267 | [email protected] "." |
1295 | [email protected] "." | 1268 | [email protected] "." |
1296 | [email protected] "." | 1269 | [email protected] " " |
1297 | [email protected] " " | 1270 | [email protected] "." |
1298 | [email protected] "." | 1271 | [email protected] "." |
1299 | [email protected] "." | 1272 | [email protected] " " |
1300 | [email protected] " " | 1273 | [email protected] "." |
1301 | [email protected] "." | 1274 | [email protected] "." |
1302 | [email protected] "." | 1275 | [email protected] " " |
1303 | [email protected] " " | 1276 | [email protected] "." |
1304 | [email protected] "." | 1277 | [email protected] "." |
1305 | [email protected] "." | 1278 | [email protected] " " |
1306 | [email protected] " " | 1279 | [email protected] "." |
1307 | [email protected] "." | 1280 | [email protected] "." |
1308 | [email protected] "." | 1281 | [email protected] ")" |
1309 | [email protected] ")" | 1282 | [email protected] ")" |
1310 | [email protected] ")" | 1283 | [email protected] ";" |
1311 | [email protected] ";" | 1284 | [email protected] "\n" |
1312 | [email protected] "\n" | 1285 | [email protected] "}" |
1313 | [email protected] "}" | ||
1314 | [email protected] "\n\n" | 1286 | [email protected] "\n\n" |
1315 | [email protected] | 1287 | [email protected] |
1316 | [email protected] "fn" | 1288 | [email protected] "fn" |
@@ -1333,170 +1305,168 @@ [email protected] | |||
1333 | [email protected] ")" | 1305 | [email protected] ")" |
1334 | [email protected] " " | 1306 | [email protected] " " |
1335 | [email protected] | 1307 | [email protected] |
1336 | [email protected] | 1308 | [email protected] "{" |
1337 | [email protected] "{" | 1309 | [email protected] "\n " |
1338 | [email protected] "\n " | 1310 | [email protected] |
1339 | [email protected] | 1311 | [email protected] "if" |
1340 | [email protected] "if" | 1312 | [email protected] " " |
1341 | [email protected] " " | 1313 | [email protected] |
1342 | [email protected] | 1314 | [email protected] |
1343 | [email protected] | 1315 | [email protected] |
1344 | [email protected] | 1316 | [email protected] |
1345 | [email protected] | 1317 | [email protected] |
1346 | [email protected] | 1318 | [email protected] |
1347 | [email protected] | 1319 | [email protected] "u8" |
1348 | [email protected] "u8" | 1320 | [email protected] " " |
1349 | [email protected] " " | 1321 | [email protected] "!=" |
1350 | [email protected] "!=" | 1322 | [email protected] " " |
1351 | [email protected] " " | 1323 | [email protected] |
1352 | [email protected] | 1324 | [email protected] "0u8" |
1353 | [email protected] "0u8" | 1325 | [email protected] " " |
1354 | [email protected] " " | 1326 | [email protected] |
1355 | [email protected] | 1327 | [email protected] "{" |
1356 | [email protected] | 1328 | [email protected] "\n " |
1357 | [email protected] "{" | 1329 | [email protected] |
1358 | [email protected] "\n " | 1330 | [email protected] |
1359 | [email protected] | 1331 | [email protected] |
1360 | [email protected] | 1332 | [email protected] |
1361 | [email protected] | 1333 | [email protected] |
1362 | [email protected] | 1334 | [email protected] "assert_eq" |
1363 | [email protected] | 1335 | [email protected] "!" |
1364 | [email protected] "assert_eq" | 1336 | [email protected] |
1365 | [email protected] "!" | 1337 | [email protected] "(" |
1366 | [email protected] | 1338 | [email protected] "8u8" |
1367 | [email protected] "(" | 1339 | [email protected] "," |
1368 | [email protected] "8u8" | 1340 | [email protected] " " |
1369 | [email protected] "," | 1341 | [email protected] |
1370 | [email protected] " " | 1342 | [email protected] "{" |
1371 | [email protected] | 1343 | [email protected] "\n " |
1372 | [email protected] "{" | 1344 | [email protected] "macro_rules" |
1373 | [email protected] "\n " | 1345 | [email protected] "!" |
1374 | [email protected] "macro_rules" | 1346 | [email protected] " " |
1375 | [email protected] "!" | 1347 | [email protected] "u8" |
1376 | [email protected] " " | 1348 | [email protected] " " |
1377 | [email protected] "u8" | 1349 | [email protected] |
1378 | [email protected] " " | 1350 | [email protected] "{" |
1379 | [email protected] | 1351 | [email protected] "\n " |
1380 | [email protected] "{" | 1352 | [email protected] |
1381 | [email protected] "\n " | 1353 | [email protected] "(" |
1382 | [email protected] | 1354 | [email protected] "u8" |
1383 | [email protected] "(" | 1355 | [email protected] ")" |
1384 | [email protected] "u8" | 1356 | [email protected] " " |
1385 | [email protected] ")" | 1357 | [email protected] "=" |
1386 | [email protected] " " | 1358 | [email protected] ">" |
1387 | [email protected] "=" | 1359 | [email protected] " " |
1388 | [email protected] ">" | 1360 | [email protected] |
1389 | [email protected] " " | 1361 | [email protected] "{" |
1390 | [email protected] | 1362 | [email protected] "\n " |
1391 | [email protected] "{" | 1363 | [email protected] "mod" |
1392 | [email protected] "\n " | 1364 | [email protected] " " |
1393 | [email protected] "mod" | 1365 | [email protected] "u8" |
1394 | [email protected] " " | 1366 | [email protected] " " |
1395 | [email protected] "u8" | 1367 | [email protected] |
1396 | [email protected] " " | 1368 | [email protected] "{" |
1397 | [email protected] | 1369 | [email protected] "\n ..." |
1398 | [email protected] "{" | 1370 | [email protected] "pub" |
1399 | [email protected] "\n ..." | 1371 | [email protected] " " |
1400 | [email protected] "pub" | 1372 | [email protected] "fn" |
1401 | [email protected] " " | 1373 | [email protected] " " |
1402 | [email protected] "fn" | 1374 | [email protected] "u8" |
1403 | [email protected] " " | 1375 | [email protected] "<" |
1404 | [email protected] "u8" | 1376 | [email protected] "\'u8" |
1405 | [email protected] "<" | 1377 | [email protected] ":" |
1406 | [email protected] "\'u8" | 1378 | [email protected] " " |
1407 | [email protected] ":" | 1379 | [email protected] "\'u8" |
1408 | [email protected] " " | 1380 | [email protected] " " |
1409 | [email protected] "\'u8" | 1381 | [email protected] "+" |
1410 | [email protected] " " | 1382 | [email protected] " " |
1411 | [email protected] "+" | 1383 | [email protected] "\'u8" |
1412 | [email protected] " " | 1384 | [email protected] ">" |
1413 | [email protected] "\'u8" | 1385 | [email protected] |
1414 | [email protected] ">" | 1386 | [email protected] "(" |
1415 | [email protected] | 1387 | [email protected] "u8" |
1416 | [email protected] "(" | 1388 | [email protected] ":" |
1417 | [email protected] "u8" | 1389 | [email protected] " " |
1418 | [email protected] ":" | 1390 | [email protected] "&" |
1419 | [email protected] " " | 1391 | [email protected] "\'u8" |
1420 | [email protected] "&" | 1392 | [email protected] " " |
1421 | [email protected] "\'u8" | 1393 | [email protected] "u8" |
1422 | [email protected] " " | 1394 | [email protected] ")" |
1423 | [email protected] "u8" | 1395 | [email protected] " " |
1424 | [email protected] ")" | 1396 | [email protected] "-" |
1425 | [email protected] " " | 1397 | [email protected] ">" |
1426 | [email protected] "-" | 1398 | [email protected] " " |
1427 | [email protected] ">" | 1399 | [email protected] "&" |
1428 | [email protected] " " | 1400 | [email protected] "\'u8" |
1429 | [email protected] "&" | 1401 | [email protected] " " |
1430 | [email protected] "\'u8" | 1402 | [email protected] "u8" |
1431 | [email protected] " " | 1403 | [email protected] " " |
1432 | [email protected] "u8" | 1404 | [email protected] |
1433 | [email protected] " " | 1405 | [email protected] "{" |
1434 | [email protected] | 1406 | [email protected] "\n ..." |
1435 | [email protected] "{" | 1407 | [email protected] "\"u8\"" |
1436 | [email protected] "\n ..." | 1408 | [email protected] ";" |
1437 | [email protected] "\"u8\"" | 1409 | [email protected] "\n ..." |
1438 | [email protected] ";" | 1410 | [email protected] "u8" |
1439 | [email protected] "\n ..." | 1411 | [email protected] "\n ..." |
1440 | [email protected] "u8" | 1412 | [email protected] "}" |
1441 | [email protected] "\n ..." | 1413 | [email protected] "\n " |
1442 | [email protected] "}" | 1414 | [email protected] "}" |
1443 | [email protected] "\n " | 1415 | [email protected] "\n " |
1444 | [email protected] "}" | 1416 | [email protected] "}" |
1445 | [email protected] "\n " | 1417 | [email protected] ";" |
1446 | [email protected] "}" | 1418 | [email protected] "\n " |
1447 | [email protected] ";" | 1419 | [email protected] "}" |
1448 | [email protected] "\n " | 1420 | [email protected] "\n\n " |
1449 | [email protected] "}" | 1421 | [email protected] "u8" |
1450 | [email protected] "\n\n " | 1422 | [email protected] "!" |
1451 | [email protected] "u8" | 1423 | [email protected] |
1452 | [email protected] "!" | 1424 | [email protected] "(" |
1453 | [email protected] | 1425 | [email protected] "u8" |
1454 | [email protected] "(" | 1426 | [email protected] ")" |
1455 | [email protected] "u8" | 1427 | [email protected] ";" |
1456 | [email protected] ")" | 1428 | [email protected] "\n " |
1457 | [email protected] ";" | 1429 | [email protected] "let" |
1458 | [email protected] "\n " | 1430 | [email protected] " " |
1459 | [email protected] "let" | 1431 | [email protected] "&" |
1460 | [email protected] " " | 1432 | [email protected] "u8" |
1461 | [email protected] "&" | 1433 | [email protected] ":" |
1462 | [email protected] "u8" | 1434 | [email protected] " " |
1463 | [email protected] ":" | 1435 | [email protected] "&" |
1464 | [email protected] " " | 1436 | [email protected] "u8" |
1465 | [email protected] "&" | 1437 | [email protected] " " |
1466 | [email protected] "u8" | 1438 | [email protected] "=" |
1467 | [email protected] " " | 1439 | [email protected] " " |
1468 | [email protected] "=" | 1440 | [email protected] "u8" |
1469 | [email protected] " " | 1441 | [email protected] ":" |
1470 | [email protected] "u8" | 1442 | [email protected] ":" |
1471 | [email protected] ":" | 1443 | [email protected] "u8" |
1472 | [email protected] ":" | 1444 | [email protected] |
1473 | [email protected] "u8" | 1445 | [email protected] "(" |
1474 | [email protected] | 1446 | [email protected] "&" |
1475 | [email protected] "(" | 1447 | [email protected] "8u8" |
1476 | [email protected] "&" | 1448 | [email protected] ")" |
1477 | [email protected] "8u8" | 1449 | [email protected] ";" |
1478 | [email protected] ")" | 1450 | [email protected] "\n " |
1479 | [email protected] ";" | 1451 | [email protected] "crate" |
1480 | [email protected] "\n " | 1452 | [email protected] ":" |
1481 | [email protected] "crate" | 1453 | [email protected] ":" |
1482 | [email protected] ":" | 1454 | [email protected] "u8" |
1483 | [email protected] ":" | 1455 | [email protected] |
1484 | [email protected] "u8" | 1456 | [email protected] "(" |
1485 | [email protected] | 1457 | [email protected] "0u8" |
1486 | [email protected] "(" | 1458 | [email protected] ")" |
1487 | [email protected] "0u8" | 1459 | [email protected] ";" |
1488 | [email protected] ")" | 1460 | [email protected] "\n " |
1489 | [email protected] ";" | 1461 | [email protected] "u8" |
1490 | [email protected] "\n " | 1462 | [email protected] "\n " |
1491 | [email protected] "u8" | 1463 | [email protected] "}" |
1492 | [email protected] "\n " | 1464 | [email protected] ")" |
1493 | [email protected] "}" | 1465 | [email protected] ";" |
1494 | [email protected] ")" | 1466 | [email protected] "\n " |
1495 | [email protected] ";" | 1467 | [email protected] "}" |
1496 | [email protected] "\n " | 1468 | [email protected] "\n" |
1497 | [email protected] "}" | 1469 | [email protected] "}" |
1498 | [email protected] "\n" | ||
1499 | [email protected] "}" | ||
1500 | [email protected] "\n\n" | 1470 | [email protected] "\n\n" |
1501 | [email protected] | 1471 | [email protected] |
1502 | [email protected] "fn" | 1472 | [email protected] "fn" |
@@ -1508,76 +1478,75 @@ [email protected] | |||
1508 | [email protected] ")" | 1478 | [email protected] ")" |
1509 | [email protected] " " | 1479 | [email protected] " " |
1510 | [email protected] | 1480 | [email protected] |
1511 | [email protected] | 1481 | [email protected] "{" |
1512 | [email protected] "{" | 1482 | [email protected] "\n " |
1513 | [email protected] "\n " | 1483 | [email protected] |
1514 | [email protected] | 1484 | [email protected] |
1515 | [email protected] | 1485 | [email protected] |
1516 | [email protected] | 1486 | [email protected] |
1517 | [email protected] | 1487 | [email protected] |
1518 | [email protected] | 1488 | [email protected] "assert_eq" |
1519 | [email protected] "assert_eq" | 1489 | [email protected] "!" |
1520 | [email protected] "!" | 1490 | [email protected] |
1521 | [email protected] | 1491 | [email protected] "(" |
1522 | [email protected] "(" | 1492 | [email protected] "String" |
1523 | [email protected] "String" | 1493 | [email protected] ":" |
1524 | [email protected] ":" | 1494 | [email protected] ":" |
1525 | [email protected] ":" | 1495 | [email protected] "from" |
1526 | [email protected] "from" | 1496 | [email protected] |
1527 | [email protected] | 1497 | [email protected] "(" |
1528 | [email protected] "(" | 1498 | [email protected] "\"><>\"" |
1529 | [email protected] "\"><>\"" | 1499 | [email protected] ")" |
1530 | [email protected] ")" | 1500 | [email protected] "," |
1531 | [email protected] "," | 1501 | [email protected] "\n " |
1532 | [email protected] "\n " | 1502 | [email protected] "String" |
1533 | [email protected] "String" | 1503 | [email protected] ":" |
1534 | [email protected] ":" | 1504 | [email protected] ":" |
1535 | [email protected] ":" | 1505 | [email protected] "<" |
1536 | [email protected] "<" | 1506 | [email protected] ">" |
1537 | [email protected] ">" | 1507 | [email protected] ":" |
1538 | [email protected] ":" | 1508 | [email protected] ":" |
1539 | [email protected] ":" | 1509 | [email protected] "from" |
1540 | [email protected] "from" | 1510 | [email protected] ":" |
1541 | [email protected] ":" | 1511 | [email protected] ":" |
1542 | [email protected] ":" | 1512 | [email protected] "<" |
1543 | [email protected] "<" | 1513 | [email protected] ">" |
1544 | [email protected] ">" | 1514 | [email protected] |
1545 | [email protected] | 1515 | [email protected] "(" |
1546 | [email protected] "(" | 1516 | [email protected] "\"><>\"" |
1547 | [email protected] "\"><>\"" | 1517 | [email protected] ")" |
1548 | [email protected] ")" | 1518 | [email protected] "." |
1549 | [email protected] "." | 1519 | [email protected] "chars" |
1550 | [email protected] "chars" | 1520 | [email protected] ":" |
1551 | [email protected] ":" | 1521 | [email protected] ":" |
1552 | [email protected] ":" | 1522 | [email protected] "<" |
1553 | [email protected] "<" | 1523 | [email protected] ">" |
1554 | [email protected] ">" | 1524 | [email protected] |
1555 | [email protected] | 1525 | [email protected] "(" |
1556 | [email protected] "(" | 1526 | [email protected] ")" |
1557 | [email protected] ")" | 1527 | [email protected] "." |
1558 | [email protected] "." | 1528 | [email protected] "rev" |
1559 | [email protected] "rev" | 1529 | [email protected] ":" |
1560 | [email protected] ":" | 1530 | [email protected] ":" |
1561 | [email protected] ":" | 1531 | [email protected] "<" |
1562 | [email protected] "<" | 1532 | [email protected] ">" |
1563 | [email protected] ">" | 1533 | [email protected] |
1564 | [email protected] | 1534 | [email protected] "(" |
1565 | [email protected] "(" | 1535 | [email protected] ")" |
1566 | [email protected] ")" | 1536 | [email protected] "." |
1567 | [email protected] "." | 1537 | [email protected] "collect" |
1568 | [email protected] "collect" | 1538 | [email protected] ":" |
1569 | [email protected] ":" | 1539 | [email protected] ":" |
1570 | [email protected] ":" | 1540 | [email protected] "<" |
1571 | [email protected] "<" | 1541 | [email protected] "String" |
1572 | [email protected] "String" | 1542 | [email protected] ">" |
1573 | [email protected] ">" | 1543 | [email protected] |
1574 | [email protected] | 1544 | [email protected] "(" |
1575 | [email protected] "(" | 1545 | [email protected] ")" |
1576 | [email protected] ")" | 1546 | [email protected] ")" |
1577 | [email protected] ")" | 1547 | [email protected] ";" |
1578 | [email protected] ";" | 1548 | [email protected] "\n" |
1579 | [email protected] "\n" | 1549 | [email protected] "}" |
1580 | [email protected] "}" | ||
1581 | [email protected] "\n\n" | 1550 | [email protected] "\n\n" |
1582 | [email protected] | 1551 | [email protected] |
1583 | [email protected] "fn" | 1552 | [email protected] "fn" |
@@ -1589,47 +1558,46 @@ [email protected] | |||
1589 | [email protected] ")" | 1558 | [email protected] ")" |
1590 | [email protected] " " | 1559 | [email protected] " " |
1591 | [email protected] | 1560 | [email protected] |
1592 | [email protected] | 1561 | [email protected] "{" |
1593 | [email protected] "{" | 1562 | [email protected] "\n " |
1594 | [email protected] "\n " | 1563 | [email protected] |
1595 | [email protected] | 1564 | [email protected] "union" |
1596 | [email protected] "union" | 1565 | [email protected] " " |
1597 | [email protected] " " | 1566 | [email protected] |
1598 | [email protected] | 1567 | [email protected] "union" |
1599 | [email protected] "union" | 1568 | [email protected] |
1600 | [email protected] | 1569 | [email protected] "<" |
1601 | [email protected] "<" | 1570 | [email protected] |
1602 | [email protected] | 1571 | [email protected] "\'union" |
1603 | [email protected] "\'union" | 1572 | [email protected] ">" |
1604 | [email protected] ">" | 1573 | [email protected] " " |
1605 | [email protected] " " | 1574 | [email protected] |
1606 | [email protected] | 1575 | [email protected] "{" |
1607 | [email protected] "{" | 1576 | [email protected] " " |
1608 | [email protected] " " | 1577 | [email protected] |
1609 | [email protected] | 1578 | [email protected] |
1610 | [email protected] | 1579 | [email protected] "union" |
1611 | [email protected] "union" | 1580 | [email protected] ":" |
1612 | [email protected] ":" | 1581 | [email protected] " " |
1613 | [email protected] " " | 1582 | [email protected] |
1614 | [email protected] | 1583 | [email protected] "&" |
1615 | [email protected] "&" | 1584 | [email protected] "\'union" |
1616 | [email protected] "\'union" | 1585 | [email protected] " " |
1617 | [email protected] " " | 1586 | [email protected] |
1618 | [email protected] | 1587 | [email protected] |
1619 | [email protected] | 1588 | [email protected] |
1620 | [email protected] | 1589 | [email protected] |
1621 | [email protected] | 1590 | [email protected] "union" |
1622 | [email protected] "union" | 1591 | [email protected] |
1623 | [email protected] | 1592 | [email protected] "<" |
1624 | [email protected] "<" | 1593 | [email protected] |
1625 | [email protected] | 1594 | [email protected] "\'union" |
1626 | [email protected] "\'union" | 1595 | [email protected] ">" |
1627 | [email protected] ">" | 1596 | [email protected] "," |
1628 | [email protected] "," | 1597 | [email protected] " " |
1629 | [email protected] " " | 1598 | [email protected] "}" |
1630 | [email protected] "}" | 1599 | [email protected] "\n" |
1631 | [email protected] "\n" | 1600 | [email protected] "}" |
1632 | [email protected] "}" | ||
1633 | [email protected] "\n\n" | 1601 | [email protected] "\n\n" |
1634 | [email protected] | 1602 | [email protected] |
1635 | [email protected] "fn" | 1603 | [email protected] "fn" |
@@ -1641,121 +1609,118 @@ [email protected] | |||
1641 | [email protected] ")" | 1609 | [email protected] ")" |
1642 | [email protected] " " | 1610 | [email protected] " " |
1643 | [email protected] | 1611 | [email protected] |
1644 | [email protected] | 1612 | [email protected] "{" |
1645 | [email protected] "{" | 1613 | [email protected] "\n " |
1646 | [email protected] "\n " | 1614 | [email protected] |
1647 | [email protected] | 1615 | [email protected] "let" |
1648 | [email protected] "let" | 1616 | [email protected] " " |
1649 | [email protected] " " | 1617 | [email protected] |
1650 | [email protected] | 1618 | [email protected] |
1651 | [email protected] | 1619 | [email protected] "val" |
1652 | [email protected] "val" | 1620 | [email protected] " " |
1653 | [email protected] " " | 1621 | [email protected] "=" |
1654 | [email protected] "=" | 1622 | [email protected] " " |
1655 | [email protected] " " | 1623 | [email protected] |
1656 | [email protected] | 1624 | [email protected] "!" |
1657 | [email protected] "!" | 1625 | [email protected] |
1658 | [email protected] | 1626 | [email protected] "(" |
1659 | [email protected] "(" | 1627 | [email protected] |
1660 | [email protected] | 1628 | [email protected] |
1661 | [email protected] | 1629 | [email protected] |
1662 | [email protected] | 1630 | [email protected] "(" |
1663 | [email protected] "(" | 1631 | [email protected] |
1664 | [email protected] | 1632 | [email protected] |
1665 | [email protected] | 1633 | [email protected] "|" |
1666 | [email protected] "|" | 1634 | [email protected] |
1667 | [email protected] | 1635 | [email protected] |
1668 | [email protected] | 1636 | [email protected] "(" |
1669 | [email protected] "(" | 1637 | [email protected] |
1670 | [email protected] | 1638 | [email protected] ".." |
1671 | [email protected] ".." | 1639 | [email protected] ")" |
1672 | [email protected] ")" | 1640 | [email protected] ":" |
1673 | [email protected] ":" | 1641 | [email protected] |
1674 | [email protected] | 1642 | [email protected] "(" |
1675 | [email protected] "(" | 1643 | [email protected] |
1676 | [email protected] | 1644 | [email protected] "_" |
1677 | [email protected] "_" | 1645 | [email protected] "," |
1678 | [email protected] "," | 1646 | [email protected] |
1679 | [email protected] | 1647 | [email protected] "_" |
1680 | [email protected] "_" | 1648 | [email protected] ")" |
1681 | [email protected] ")" | 1649 | [email protected] "," |
1682 | [email protected] "," | 1650 | [email protected] |
1683 | [email protected] | 1651 | [email protected] |
1684 | [email protected] | 1652 | [email protected] |
1685 | [email protected] | 1653 | [email protected] "__" |
1686 | [email protected] "__" | 1654 | [email protected] "@" |
1687 | [email protected] "@" | 1655 | [email protected] |
1688 | [email protected] | 1656 | [email protected] "_" |
1689 | [email protected] "_" | 1657 | [email protected] "|" |
1690 | [email protected] "|" | 1658 | [email protected] |
1691 | [email protected] | 1659 | [email protected] |
1692 | [email protected] | 1660 | [email protected] |
1693 | [email protected] | 1661 | [email protected] |
1694 | [email protected] | 1662 | [email protected] "__" |
1695 | [email protected] "__" | 1663 | [email protected] ")" |
1696 | [email protected] ")" | 1664 | [email protected] |
1697 | [email protected] | 1665 | [email protected] "(" |
1698 | [email protected] "(" | 1666 | [email protected] |
1699 | [email protected] | 1667 | [email protected] "(" |
1700 | [email protected] "(" | 1668 | [email protected] |
1701 | [email protected] | 1669 | [email protected] "&" |
1702 | [email protected] "&" | 1670 | [email protected] |
1703 | [email protected] | 1671 | [email protected] "*" |
1704 | [email protected] "*" | 1672 | [email protected] |
1705 | [email protected] | 1673 | [email protected] "\"\\\\\"" |
1706 | [email protected] "\"\\\\\"" | 1674 | [email protected] "," |
1707 | [email protected] "," | 1675 | [email protected] |
1708 | [email protected] | 1676 | [email protected] "\'🤔\'" |
1709 | [email protected] "\'🤔\'" | 1677 | [email protected] ")" |
1710 | [email protected] ")" | 1678 | [email protected] "/**/" |
1711 | [email protected] "/**/" | 1679 | [email protected] "," |
1712 | [email protected] "," | 1680 | [email protected] |
1713 | [email protected] | 1681 | [email protected] "{" |
1714 | [email protected] | 1682 | [email protected] "}" |
1715 | [email protected] "{" | 1683 | [email protected] ")" |
1716 | [email protected] "}" | 1684 | [email protected] "==" |
1717 | [email protected] ")" | 1685 | [email protected] |
1718 | [email protected] "==" | 1686 | [email protected] "{" |
1719 | [email protected] | 1687 | [email protected] |
1720 | [email protected] | 1688 | [email protected] |
1721 | [email protected] "{" | 1689 | [email protected] "&" |
1722 | [email protected] | 1690 | [email protected] |
1723 | [email protected] | 1691 | [email protected] |
1724 | [email protected] "&" | 1692 | [email protected] "[" |
1725 | [email protected] | 1693 | [email protected] |
1726 | [email protected] | 1694 | [email protected] "..=" |
1727 | [email protected] "[" | 1695 | [email protected] |
1728 | [email protected] | 1696 | [email protected] ".." |
1729 | [email protected] "..=" | 1697 | [email protected] "]" |
1730 | [email protected] | 1698 | [email protected] "[" |
1731 | [email protected] ".." | 1699 | [email protected] |
1732 | [email protected] "]" | 1700 | [email protected] ".." |
1733 | [email protected] "[" | 1701 | [email protected] "]" |
1734 | [email protected] | 1702 | [email protected] ";" |
1735 | [email protected] ".." | 1703 | [email protected] "}" |
1736 | [email protected] "]" | 1704 | [email protected] ")" |
1737 | [email protected] ";" | 1705 | [email protected] "//" |
1738 | [email protected] "}" | 1706 | [email protected] "\n " |
1739 | [email protected] ")" | 1707 | [email protected] ";" |
1740 | [email protected] "//" | 1708 | [email protected] "\n " |
1741 | [email protected] "\n " | 1709 | [email protected] |
1742 | [email protected] ";" | 1710 | [email protected] |
1743 | [email protected] "\n " | 1711 | [email protected] |
1744 | [email protected] | 1712 | [email protected] |
1745 | [email protected] | 1713 | [email protected] |
1746 | [email protected] | 1714 | [email protected] "assert" |
1747 | [email protected] | 1715 | [email protected] "!" |
1748 | [email protected] | 1716 | [email protected] |
1749 | [email protected] "assert" | 1717 | [email protected] "(" |
1750 | [email protected] "!" | 1718 | [email protected] "!" |
1751 | [email protected] | 1719 | [email protected] "val" |
1752 | [email protected] "(" | 1720 | [email protected] ")" |
1753 | [email protected] "!" | 1721 | [email protected] ";" |
1754 | [email protected] "val" | 1722 | [email protected] "\n" |
1755 | [email protected] ")" | 1723 | [email protected] "}" |
1756 | [email protected] ";" | ||
1757 | [email protected] "\n" | ||
1758 | [email protected] "}" | ||
1759 | [email protected] "\n\n" | 1724 | [email protected] "\n\n" |
1760 | [email protected] | 1725 | [email protected] |
1761 | [email protected] "fn" | 1726 | [email protected] "fn" |
@@ -1791,306 +1756,305 @@ [email protected] | |||
1791 | [email protected] "Debug" | 1756 | [email protected] "Debug" |
1792 | [email protected] " " | 1757 | [email protected] " " |
1793 | [email protected] | 1758 | [email protected] |
1794 | [email protected] | 1759 | [email protected] "{" |
1795 | [email protected] "{" | 1760 | [email protected] "\n " |
1796 | [email protected] "\n " | 1761 | [email protected] |
1797 | [email protected] | 1762 | [email protected] "..=" |
1798 | [email protected] "..=" | 1763 | [email protected] |
1799 | [email protected] | 1764 | [email protected] "..=" |
1800 | [email protected] "..=" | 1765 | [email protected] |
1801 | [email protected] | 1766 | [email protected] ".." |
1802 | [email protected] ".." | 1767 | [email protected] " " |
1803 | [email protected] " " | 1768 | [email protected] |
1804 | [email protected] | 1769 | [email protected] ".." |
1805 | [email protected] ".." | 1770 | [email protected] " " |
1806 | [email protected] " " | 1771 | [email protected] |
1807 | [email protected] | 1772 | [email protected] ".." |
1808 | [email protected] ".." | 1773 | [email protected] " " |
1809 | [email protected] " " | 1774 | [email protected] |
1810 | [email protected] | 1775 | [email protected] ".." |
1811 | [email protected] ".." | 1776 | [email protected] " " |
1812 | [email protected] " " | 1777 | [email protected] |
1813 | [email protected] | 1778 | [email protected] ".." |
1814 | [email protected] ".." | 1779 | [email protected] " " |
1815 | [email protected] " " | 1780 | [email protected] |
1816 | [email protected] | 1781 | [email protected] ".." |
1817 | [email protected] ".." | 1782 | [email protected] " " |
1818 | [email protected] " " | 1783 | [email protected] |
1819 | [email protected] | 1784 | [email protected] ".." |
1820 | [email protected] ".." | 1785 | [email protected] " " |
1821 | [email protected] " " | 1786 | [email protected] |
1822 | [email protected] | 1787 | [email protected] ".." |
1823 | [email protected] ".." | 1788 | [email protected] " " |
1824 | [email protected] " " | 1789 | [email protected] |
1825 | [email protected] | 1790 | [email protected] ".." |
1826 | [email protected] ".." | 1791 | [email protected] " " |
1827 | [email protected] " " | 1792 | [email protected] |
1828 | [email protected] | 1793 | [email protected] ".." |
1829 | [email protected] ".." | 1794 | [email protected] " " |
1830 | [email protected] " " | 1795 | [email protected] |
1831 | [email protected] | 1796 | [email protected] ".." |
1832 | [email protected] ".." | 1797 | [email protected] " " |
1833 | [email protected] " " | 1798 | [email protected] |
1834 | [email protected] | 1799 | [email protected] "..=" |
1835 | [email protected] "..=" | 1800 | [email protected] |
1836 | [email protected] | 1801 | [email protected] ".." |
1837 | [email protected] ".." | 1802 | [email protected] " " |
1838 | [email protected] " " | 1803 | [email protected] |
1839 | [email protected] | 1804 | [email protected] ".." |
1840 | [email protected] ".." | 1805 | [email protected] "\n " |
1841 | [email protected] "\n " | 1806 | [email protected] |
1842 | [email protected] | 1807 | [email protected] "..=" |
1843 | [email protected] "..=" | 1808 | [email protected] |
1844 | [email protected] | 1809 | [email protected] ".." |
1845 | [email protected] ".." | 1810 | [email protected] " " |
1846 | [email protected] " " | 1811 | [email protected] |
1847 | [email protected] | 1812 | [email protected] "..=" |
1848 | [email protected] "..=" | 1813 | [email protected] |
1849 | [email protected] | 1814 | [email protected] ".." |
1850 | [email protected] ".." | 1815 | [email protected] " " |
1851 | [email protected] " " | 1816 | [email protected] |
1852 | [email protected] | 1817 | [email protected] ".." |
1853 | [email protected] ".." | 1818 | [email protected] " " |
1854 | [email protected] " " | 1819 | [email protected] |
1855 | [email protected] | 1820 | [email protected] ".." |
1856 | [email protected] ".." | 1821 | [email protected] " " |
1857 | [email protected] " " | 1822 | [email protected] |
1858 | [email protected] | 1823 | [email protected] ".." |
1859 | [email protected] ".." | 1824 | [email protected] " " |
1860 | [email protected] " " | 1825 | [email protected] |
1861 | [email protected] | 1826 | [email protected] ".." |
1862 | [email protected] ".." | 1827 | [email protected] " " |
1863 | [email protected] " " | 1828 | [email protected] |
1864 | [email protected] | 1829 | [email protected] ".." |
1865 | [email protected] ".." | 1830 | [email protected] " " |
1866 | [email protected] " " | 1831 | [email protected] |
1867 | [email protected] | 1832 | [email protected] ".." |
1868 | [email protected] ".." | 1833 | [email protected] " " |
1869 | [email protected] " " | 1834 | [email protected] |
1870 | [email protected] | 1835 | [email protected] ".." |
1871 | [email protected] ".." | 1836 | [email protected] " " |
1872 | [email protected] " " | 1837 | [email protected] |
1873 | [email protected] | 1838 | [email protected] ".." |
1874 | [email protected] ".." | 1839 | [email protected] " " |
1875 | [email protected] " " | 1840 | [email protected] |
1876 | [email protected] | 1841 | [email protected] "..=" |
1877 | [email protected] "..=" | 1842 | [email protected] |
1878 | [email protected] | 1843 | [email protected] "..=" |
1879 | [email protected] "..=" | 1844 | [email protected] |
1880 | [email protected] | 1845 | [email protected] "..=" |
1881 | [email protected] "..=" | 1846 | [email protected] |
1882 | [email protected] | 1847 | [email protected] ".." |
1883 | [email protected] ".." | 1848 | [email protected] "\n " |
1884 | [email protected] "\n " | 1849 | [email protected] |
1885 | [email protected] | 1850 | [email protected] "..=" |
1886 | [email protected] "..=" | 1851 | [email protected] |
1887 | [email protected] | 1852 | [email protected] ".." |
1888 | [email protected] ".." | 1853 | [email protected] " " |
1889 | [email protected] " " | 1854 | [email protected] |
1890 | [email protected] | 1855 | [email protected] "..=" |
1891 | [email protected] "..=" | 1856 | [email protected] |
1892 | [email protected] | 1857 | [email protected] ".." |
1893 | [email protected] ".." | 1858 | [email protected] " " |
1894 | [email protected] " " | 1859 | [email protected] |
1895 | [email protected] | 1860 | [email protected] "..=" |
1896 | [email protected] "..=" | 1861 | [email protected] |
1897 | [email protected] | 1862 | [email protected] ".." |
1898 | [email protected] ".." | 1863 | [email protected] " " |
1899 | [email protected] " " | 1864 | [email protected] |
1900 | [email protected] | 1865 | [email protected] "..=" |
1901 | [email protected] "..=" | 1866 | [email protected] |
1902 | [email protected] | 1867 | [email protected] ".." |
1903 | [email protected] ".." | 1868 | [email protected] " " |
1904 | [email protected] " " | 1869 | [email protected] |
1905 | [email protected] | 1870 | [email protected] ".." |
1906 | [email protected] ".." | 1871 | [email protected] " " |
1907 | [email protected] " " | 1872 | [email protected] |
1908 | [email protected] | 1873 | [email protected] "..=" |
1909 | [email protected] "..=" | 1874 | [email protected] |
1910 | [email protected] | 1875 | [email protected] "..=" |
1911 | [email protected] "..=" | 1876 | [email protected] |
1912 | [email protected] | 1877 | [email protected] ".." |
1913 | [email protected] ".." | 1878 | [email protected] " " |
1914 | [email protected] " " | 1879 | [email protected] |
1915 | [email protected] | 1880 | [email protected] ".." |
1916 | [email protected] ".." | 1881 | [email protected] " " |
1917 | [email protected] " " | 1882 | [email protected] |
1918 | [email protected] | 1883 | [email protected] "..=" |
1919 | [email protected] "..=" | 1884 | [email protected] |
1920 | [email protected] | 1885 | [email protected] ".." |
1921 | [email protected] ".." | 1886 | [email protected] " " |
1922 | [email protected] " " | 1887 | [email protected] |
1923 | [email protected] | 1888 | [email protected] ".." |
1924 | [email protected] ".." | 1889 | [email protected] "\n " |
1925 | [email protected] "\n " | 1890 | [email protected] |
1926 | [email protected] | 1891 | [email protected] "..=" |
1927 | [email protected] "..=" | 1892 | [email protected] |
1928 | [email protected] | 1893 | [email protected] "..=" |
1929 | [email protected] "..=" | 1894 | [email protected] |
1930 | [email protected] | 1895 | [email protected] ".." |
1931 | [email protected] ".." | 1896 | [email protected] " " |
1932 | [email protected] " " | 1897 | [email protected] |
1933 | [email protected] | 1898 | [email protected] ".." |
1934 | [email protected] ".." | 1899 | [email protected] " " |
1935 | [email protected] " " | 1900 | [email protected] |
1936 | [email protected] | 1901 | [email protected] "..=" |
1937 | [email protected] "..=" | 1902 | [email protected] |
1938 | [email protected] | 1903 | [email protected] ".." |
1939 | [email protected] ".." | 1904 | [email protected] " " |
1940 | [email protected] " " | 1905 | [email protected] |
1941 | [email protected] | 1906 | [email protected] "..=" |
1942 | [email protected] "..=" | 1907 | [email protected] |
1943 | [email protected] | 1908 | [email protected] ".." |
1944 | [email protected] ".." | 1909 | [email protected] " " |
1945 | [email protected] " " | 1910 | [email protected] |
1946 | [email protected] | 1911 | [email protected] "..=" |
1947 | [email protected] "..=" | 1912 | [email protected] |
1948 | [email protected] | 1913 | [email protected] ".." |
1949 | [email protected] ".." | 1914 | [email protected] " " |
1950 | [email protected] " " | 1915 | [email protected] |
1951 | [email protected] | 1916 | [email protected] ".." |
1952 | [email protected] ".." | 1917 | [email protected] " " |
1953 | [email protected] " " | 1918 | [email protected] |
1954 | [email protected] | 1919 | [email protected] ".." |
1955 | [email protected] ".." | 1920 | [email protected] " " |
1956 | [email protected] " " | 1921 | [email protected] |
1957 | [email protected] | 1922 | [email protected] ".." |
1958 | [email protected] ".." | 1923 | [email protected] " " |
1959 | [email protected] " " | 1924 | [email protected] |
1960 | [email protected] | 1925 | [email protected] "..=" |
1961 | [email protected] "..=" | 1926 | [email protected] |
1962 | [email protected] | 1927 | [email protected] ".." |
1963 | [email protected] ".." | 1928 | [email protected] " " |
1964 | [email protected] " " | 1929 | [email protected] |
1965 | [email protected] | 1930 | [email protected] ".." |
1966 | [email protected] ".." | 1931 | [email protected] "\n " |
1967 | [email protected] "\n " | 1932 | [email protected] |
1968 | [email protected] | 1933 | [email protected] "..=" |
1969 | [email protected] "..=" | 1934 | [email protected] |
1970 | [email protected] | 1935 | [email protected] ".." |
1971 | [email protected] ".." | 1936 | [email protected] " " |
1972 | [email protected] " " | 1937 | [email protected] |
1973 | [email protected] | 1938 | [email protected] "..=" |
1974 | [email protected] "..=" | 1939 | [email protected] |
1975 | [email protected] | 1940 | [email protected] ".." |
1976 | [email protected] ".." | 1941 | [email protected] " " |
1977 | [email protected] " " | 1942 | [email protected] |
1978 | [email protected] | 1943 | [email protected] "..=" |
1979 | [email protected] "..=" | 1944 | [email protected] |
1980 | [email protected] | 1945 | [email protected] ".." |
1981 | [email protected] ".." | 1946 | [email protected] " " |
1982 | [email protected] " " | 1947 | [email protected] |
1983 | [email protected] | 1948 | [email protected] "..=" |
1984 | [email protected] "..=" | 1949 | [email protected] |
1985 | [email protected] | 1950 | [email protected] ".." |
1986 | [email protected] ".." | 1951 | [email protected] " " |
1987 | [email protected] " " | 1952 | [email protected] |
1988 | [email protected] | 1953 | [email protected] ".." |
1989 | [email protected] ".." | 1954 | [email protected] " " |
1990 | [email protected] " " | 1955 | [email protected] |
1991 | [email protected] | 1956 | [email protected] "..=" |
1992 | [email protected] "..=" | 1957 | [email protected] |
1993 | [email protected] | 1958 | [email protected] ".." |
1994 | [email protected] ".." | 1959 | [email protected] " " |
1995 | [email protected] " " | 1960 | [email protected] |
1996 | [email protected] | 1961 | [email protected] ".." |
1997 | [email protected] ".." | 1962 | [email protected] " " |
1998 | [email protected] " " | 1963 | [email protected] |
1999 | [email protected] | 1964 | [email protected] ".." |
2000 | [email protected] ".." | 1965 | [email protected] " " |
2001 | [email protected] " " | 1966 | [email protected] |
2002 | [email protected] | 1967 | [email protected] "..=" |
2003 | [email protected] "..=" | 1968 | [email protected] |
2004 | [email protected] | 1969 | [email protected] ".." |
2005 | [email protected] ".." | 1970 | [email protected] " " |
2006 | [email protected] " " | 1971 | [email protected] |
2007 | [email protected] | 1972 | [email protected] ".." |
2008 | [email protected] ".." | 1973 | [email protected] "\n " |
2009 | [email protected] "\n " | 1974 | [email protected] |
2010 | [email protected] | 1975 | [email protected] "..=" |
2011 | [email protected] "..=" | 1976 | [email protected] |
2012 | [email protected] | 1977 | [email protected] ".." |
2013 | [email protected] ".." | 1978 | [email protected] " " |
2014 | [email protected] " " | 1979 | [email protected] |
2015 | [email protected] | 1980 | [email protected] "..=" |
2016 | [email protected] "..=" | 1981 | [email protected] |
2017 | [email protected] | 1982 | [email protected] ".." |
2018 | [email protected] ".." | 1983 | [email protected] " " |
2019 | [email protected] " " | 1984 | [email protected] |
2020 | [email protected] | 1985 | [email protected] "..=" |
2021 | [email protected] "..=" | 1986 | [email protected] |
2022 | [email protected] | 1987 | [email protected] ".." |
2023 | [email protected] ".." | 1988 | [email protected] " " |
2024 | [email protected] " " | 1989 | [email protected] |
2025 | [email protected] | 1990 | [email protected] "..=" |
2026 | [email protected] "..=" | 1991 | [email protected] |
2027 | [email protected] | 1992 | [email protected] ".." |
2028 | [email protected] ".." | 1993 | [email protected] " " |
2029 | [email protected] " " | 1994 | [email protected] |
2030 | [email protected] | 1995 | [email protected] ".." |
2031 | [email protected] ".." | 1996 | [email protected] " " |
2032 | [email protected] " " | 1997 | [email protected] |
2033 | [email protected] | 1998 | [email protected] ".." |
2034 | [email protected] ".." | 1999 | [email protected] " " |
2035 | [email protected] " " | 2000 | [email protected] |
2036 | [email protected] | 2001 | [email protected] "..=" |
2037 | [email protected] "..=" | 2002 | [email protected] |
2038 | [email protected] | 2003 | [email protected] ".." |
2039 | [email protected] ".." | 2004 | [email protected] " " |
2040 | [email protected] " " | 2005 | [email protected] |
2041 | [email protected] | 2006 | [email protected] ".." |
2042 | [email protected] ".." | 2007 | [email protected] " " |
2043 | [email protected] " " | 2008 | [email protected] |
2044 | [email protected] | 2009 | [email protected] "..=" |
2045 | [email protected] "..=" | 2010 | [email protected] |
2046 | [email protected] | 2011 | [email protected] ".." |
2047 | [email protected] ".." | 2012 | [email protected] " " |
2048 | [email protected] " " | 2013 | [email protected] |
2049 | [email protected] | 2014 | [email protected] ".." |
2050 | [email protected] ".." | 2015 | [email protected] "\n " |
2051 | [email protected] "\n " | 2016 | [email protected] |
2052 | [email protected] | 2017 | [email protected] "..=" |
2053 | [email protected] "..=" | 2018 | [email protected] |
2054 | [email protected] | 2019 | [email protected] ".." |
2055 | [email protected] ".." | 2020 | [email protected] " " |
2056 | [email protected] " " | 2021 | [email protected] |
2057 | [email protected] | 2022 | [email protected] "..=" |
2058 | [email protected] "..=" | 2023 | [email protected] |
2059 | [email protected] | 2024 | [email protected] ".." |
2060 | [email protected] ".." | 2025 | [email protected] " " |
2061 | [email protected] " " | 2026 | [email protected] |
2062 | [email protected] | 2027 | [email protected] ".." |
2063 | [email protected] ".." | 2028 | [email protected] " " |
2064 | [email protected] " " | 2029 | [email protected] |
2065 | [email protected] | 2030 | [email protected] "..=" |
2066 | [email protected] "..=" | 2031 | [email protected] |
2067 | [email protected] | 2032 | [email protected] "..=" |
2068 | [email protected] "..=" | 2033 | [email protected] |
2069 | [email protected] | 2034 | [email protected] ".." |
2070 | [email protected] ".." | 2035 | [email protected] " " |
2071 | [email protected] " " | 2036 | [email protected] |
2072 | [email protected] | 2037 | [email protected] "..=" |
2073 | [email protected] "..=" | 2038 | [email protected] |
2074 | [email protected] | 2039 | [email protected] "..=" |
2075 | [email protected] "..=" | 2040 | [email protected] |
2076 | [email protected] | 2041 | [email protected] ".." |
2077 | [email protected] ".." | 2042 | [email protected] " " |
2078 | [email protected] " " | 2043 | [email protected] |
2079 | [email protected] | 2044 | [email protected] ".." |
2080 | [email protected] ".." | 2045 | [email protected] " " |
2081 | [email protected] " " | 2046 | [email protected] |
2082 | [email protected] | 2047 | [email protected] ".." |
2083 | [email protected] ".." | 2048 | [email protected] " " |
2084 | [email protected] " " | 2049 | [email protected] |
2085 | [email protected] | 2050 | [email protected] "..=" |
2086 | [email protected] "..=" | 2051 | [email protected] |
2087 | [email protected] | 2052 | [email protected] ".." |
2088 | [email protected] ".." | 2053 | [email protected] " " |
2089 | [email protected] " " | 2054 | [email protected] |
2090 | [email protected] | 2055 | [email protected] ".." |
2091 | [email protected] ".." | 2056 | [email protected] "\n" |
2092 | [email protected] "\n" | 2057 | [email protected] "}" |
2093 | [email protected] "}" | ||
2094 | [email protected] "\n\n" | 2058 | [email protected] "\n\n" |
2095 | [email protected] | 2059 | [email protected] |
2096 | [email protected] "fn" | 2060 | [email protected] "fn" |
@@ -2102,30 +2066,29 @@ [email protected] | |||
2102 | [email protected] ")" | 2066 | [email protected] ")" |
2103 | [email protected] " " | 2067 | [email protected] " " |
2104 | [email protected] | 2068 | [email protected] |
2105 | [email protected] | 2069 | [email protected] "{" |
2106 | [email protected] "{" | 2070 | [email protected] "\n " |
2107 | [email protected] "\n " | 2071 | [email protected] ";" |
2108 | [email protected] ";" | 2072 | [email protected] ";" |
2109 | [email protected] ";" | 2073 | [email protected] ";" |
2110 | [email protected] ";" | 2074 | [email protected] |
2111 | [email protected] | 2075 | [email protected] |
2112 | [email protected] | 2076 | [email protected] "(" |
2113 | [email protected] "(" | 2077 | [email protected] ")" |
2114 | [email protected] ")" | 2078 | [email protected] ";" |
2115 | [email protected] ";" | 2079 | [email protected] ";" |
2116 | [email protected] ";" | 2080 | [email protected] ";" |
2117 | [email protected] ";" | 2081 | [email protected] ";" |
2118 | [email protected] ";" | 2082 | [email protected] ";" |
2119 | [email protected] ";" | 2083 | [email protected] ";" |
2120 | [email protected] ";" | 2084 | [email protected] ";" |
2121 | [email protected] ";" | 2085 | [email protected] ";" |
2122 | [email protected] ";" | 2086 | [email protected] ";" |
2123 | [email protected] ";" | 2087 | [email protected] |
2124 | [email protected] | 2088 | [email protected] "(" |
2125 | [email protected] "(" | 2089 | [email protected] ")" |
2126 | [email protected] ")" | 2090 | [email protected] "\n" |
2127 | [email protected] "\n" | 2091 | [email protected] "}" |
2128 | [email protected] "}" | ||
2129 | [email protected] "\n\n" | 2092 | [email protected] "\n\n" |
2130 | [email protected] | 2093 | [email protected] |
2131 | [email protected] | 2094 | [email protected] |
@@ -2140,190 +2103,189 @@ [email protected] | |||
2140 | [email protected] ")" | 2103 | [email protected] ")" |
2141 | [email protected] " " | 2104 | [email protected] " " |
2142 | [email protected] | 2105 | [email protected] |
2143 | [email protected] | 2106 | [email protected] "{" |
2144 | [email protected] "{" | 2107 | [email protected] "\n " |
2145 | [email protected] "\n " | 2108 | [email protected] |
2146 | [email protected] | 2109 | [email protected] |
2147 | [email protected] | 2110 | [email protected] |
2148 | [email protected] | 2111 | [email protected] |
2149 | [email protected] | 2112 | [email protected] |
2150 | [email protected] | 2113 | [email protected] |
2151 | [email protected] | 2114 | [email protected] "strange" |
2152 | [email protected] "strange" | 2115 | [email protected] |
2153 | [email protected] | 2116 | [email protected] "(" |
2154 | [email protected] "(" | 2117 | [email protected] ")" |
2155 | [email protected] ")" | 2118 | [email protected] ";" |
2156 | [email protected] ";" | 2119 | [email protected] "\n " |
2157 | [email protected] "\n " | 2120 | [email protected] |
2158 | [email protected] | 2121 | [email protected] |
2159 | [email protected] | 2122 | [email protected] |
2160 | [email protected] | 2123 | [email protected] |
2161 | [email protected] | 2124 | [email protected] |
2162 | [email protected] | 2125 | [email protected] |
2163 | [email protected] | 2126 | [email protected] "funny" |
2164 | [email protected] "funny" | 2127 | [email protected] |
2165 | [email protected] | 2128 | [email protected] "(" |
2166 | [email protected] "(" | 2129 | [email protected] ")" |
2167 | [email protected] ")" | 2130 | [email protected] ";" |
2168 | [email protected] ";" | 2131 | [email protected] "\n " |
2169 | [email protected] "\n " | 2132 | [email protected] |
2170 | [email protected] | 2133 | [email protected] |
2171 | [email protected] | 2134 | [email protected] |
2172 | [email protected] | 2135 | [email protected] |
2173 | [email protected] | 2136 | [email protected] |
2174 | [email protected] | 2137 | [email protected] |
2175 | [email protected] | 2138 | [email protected] "what" |
2176 | [email protected] "what" | 2139 | [email protected] |
2177 | [email protected] | 2140 | [email protected] "(" |
2178 | [email protected] "(" | 2141 | [email protected] ")" |
2179 | [email protected] ")" | 2142 | [email protected] ";" |
2180 | [email protected] ";" | 2143 | [email protected] "\n " |
2181 | [email protected] "\n " | 2144 | [email protected] |
2182 | [email protected] | 2145 | [email protected] |
2183 | [email protected] | 2146 | [email protected] |
2184 | [email protected] | 2147 | [email protected] |
2185 | [email protected] | 2148 | [email protected] |
2186 | [email protected] | 2149 | [email protected] |
2187 | [email protected] | 2150 | [email protected] "zombiejesus" |
2188 | [email protected] "zombiejesus" | 2151 | [email protected] |
2189 | [email protected] | 2152 | [email protected] "(" |
2190 | [email protected] "(" | 2153 | [email protected] ")" |
2191 | [email protected] ")" | 2154 | [email protected] ";" |
2192 | [email protected] ";" | 2155 | [email protected] "\n " |
2193 | [email protected] "\n " | 2156 | [email protected] |
2194 | [email protected] | 2157 | [email protected] |
2195 | [email protected] | 2158 | [email protected] |
2196 | [email protected] | 2159 | [email protected] |
2197 | [email protected] | 2160 | [email protected] |
2198 | [email protected] | 2161 | [email protected] |
2199 | [email protected] | 2162 | [email protected] "notsure" |
2200 | [email protected] "notsure" | 2163 | [email protected] |
2201 | [email protected] | 2164 | [email protected] "(" |
2202 | [email protected] "(" | 2165 | [email protected] ")" |
2203 | [email protected] ")" | 2166 | [email protected] ";" |
2204 | [email protected] ";" | 2167 | [email protected] "\n " |
2205 | [email protected] "\n " | 2168 | [email protected] |
2206 | [email protected] | 2169 | [email protected] |
2207 | [email protected] | 2170 | [email protected] |
2208 | [email protected] | 2171 | [email protected] |
2209 | [email protected] | 2172 | [email protected] |
2210 | [email protected] | 2173 | [email protected] |
2211 | [email protected] | 2174 | [email protected] "canttouchthis" |
2212 | [email protected] "canttouchthis" | 2175 | [email protected] |
2213 | [email protected] | 2176 | [email protected] "(" |
2214 | [email protected] "(" | 2177 | [email protected] ")" |
2215 | [email protected] ")" | 2178 | [email protected] ";" |
2216 | [email protected] ";" | 2179 | [email protected] "\n " |
2217 | [email protected] "\n " | 2180 | [email protected] |
2218 | [email protected] | 2181 | [email protected] |
2219 | [email protected] | 2182 | [email protected] |
2220 | [email protected] | 2183 | [email protected] |
2221 | [email protected] | 2184 | [email protected] |
2222 | [email protected] | 2185 | [email protected] |
2223 | [email protected] | 2186 | [email protected] "angrydome" |
2224 | [email protected] "angrydome" | 2187 | [email protected] |
2225 | [email protected] | 2188 | [email protected] "(" |
2226 | [email protected] "(" | 2189 | [email protected] ")" |
2227 | [email protected] ")" | 2190 | [email protected] ";" |
2228 | [email protected] ";" | 2191 | [email protected] "\n " |
2229 | [email protected] "\n " | 2192 | [email protected] |
2230 | [email protected] | 2193 | [email protected] |
2231 | [email protected] | 2194 | [email protected] |
2232 | [email protected] | 2195 | [email protected] |
2233 | [email protected] | 2196 | [email protected] |
2234 | [email protected] | 2197 | [email protected] |
2235 | [email protected] | 2198 | [email protected] "evil_lincoln" |
2236 | [email protected] "evil_lincoln" | 2199 | [email protected] |
2237 | [email protected] | 2200 | [email protected] "(" |
2238 | [email protected] "(" | 2201 | [email protected] ")" |
2239 | [email protected] ")" | 2202 | [email protected] ";" |
2240 | [email protected] ";" | 2203 | [email protected] "\n " |
2241 | [email protected] "\n " | 2204 | [email protected] |
2242 | [email protected] | 2205 | [email protected] |
2243 | [email protected] | 2206 | [email protected] |
2244 | [email protected] | 2207 | [email protected] |
2245 | [email protected] | 2208 | [email protected] |
2246 | [email protected] | 2209 | [email protected] |
2247 | [email protected] | 2210 | [email protected] "dots" |
2248 | [email protected] "dots" | 2211 | [email protected] |
2249 | [email protected] | 2212 | [email protected] "(" |
2250 | [email protected] "(" | 2213 | [email protected] ")" |
2251 | [email protected] ")" | 2214 | [email protected] ";" |
2252 | [email protected] ";" | 2215 | [email protected] "\n " |
2253 | [email protected] "\n " | 2216 | [email protected] |
2254 | [email protected] | 2217 | [email protected] |
2255 | [email protected] | 2218 | [email protected] |
2256 | [email protected] | 2219 | [email protected] |
2257 | [email protected] | 2220 | [email protected] |
2258 | [email protected] | 2221 | [email protected] |
2259 | [email protected] | 2222 | [email protected] "u8" |
2260 | [email protected] "u8" | 2223 | [email protected] |
2261 | [email protected] | 2224 | [email protected] "(" |
2262 | [email protected] "(" | 2225 | [email protected] |
2263 | [email protected] | 2226 | [email protected] "8u8" |
2264 | [email protected] "8u8" | 2227 | [email protected] ")" |
2265 | [email protected] ")" | 2228 | [email protected] ";" |
2266 | [email protected] ";" | 2229 | [email protected] "\n " |
2267 | [email protected] "\n " | 2230 | [email protected] |
2268 | [email protected] | 2231 | [email protected] |
2269 | [email protected] | 2232 | [email protected] |
2270 | [email protected] | 2233 | [email protected] |
2271 | [email protected] | 2234 | [email protected] |
2272 | [email protected] | 2235 | [email protected] |
2273 | [email protected] | 2236 | [email protected] "fishy" |
2274 | [email protected] "fishy" | 2237 | [email protected] |
2275 | [email protected] | 2238 | [email protected] "(" |
2276 | [email protected] "(" | 2239 | [email protected] ")" |
2277 | [email protected] ")" | 2240 | [email protected] ";" |
2278 | [email protected] ";" | 2241 | [email protected] "\n " |
2279 | [email protected] "\n " | 2242 | [email protected] |
2280 | [email protected] | 2243 | [email protected] |
2281 | [email protected] | 2244 | [email protected] |
2282 | [email protected] | 2245 | [email protected] |
2283 | [email protected] | 2246 | [email protected] |
2284 | [email protected] | 2247 | [email protected] |
2285 | [email protected] | 2248 | [email protected] "union" |
2286 | [email protected] "union" | 2249 | [email protected] |
2287 | [email protected] | 2250 | [email protected] "(" |
2288 | [email protected] "(" | 2251 | [email protected] ")" |
2289 | [email protected] ")" | 2252 | [email protected] ";" |
2290 | [email protected] ";" | 2253 | [email protected] "\n " |
2291 | [email protected] "\n " | 2254 | [email protected] |
2292 | [email protected] | 2255 | [email protected] |
2293 | [email protected] | 2256 | [email protected] |
2294 | [email protected] | 2257 | [email protected] |
2295 | [email protected] | 2258 | [email protected] |
2296 | [email protected] | 2259 | [email protected] |
2297 | [email protected] | 2260 | [email protected] "special_characters" |
2298 | [email protected] "special_characters" | 2261 | [email protected] |
2299 | [email protected] | 2262 | [email protected] "(" |
2300 | [email protected] "(" | 2263 | [email protected] ")" |
2301 | [email protected] ")" | 2264 | [email protected] ";" |
2302 | [email protected] ";" | 2265 | [email protected] "\n " |
2303 | [email protected] "\n " | 2266 | [email protected] |
2304 | [email protected] | 2267 | [email protected] |
2305 | [email protected] | 2268 | [email protected] |
2306 | [email protected] | 2269 | [email protected] |
2307 | [email protected] | 2270 | [email protected] |
2308 | [email protected] | 2271 | [email protected] |
2309 | [email protected] | 2272 | [email protected] "punch_card" |
2310 | [email protected] "punch_card" | 2273 | [email protected] |
2311 | [email protected] | 2274 | [email protected] "(" |
2312 | [email protected] "(" | 2275 | [email protected] ")" |
2313 | [email protected] ")" | 2276 | [email protected] ";" |
2314 | [email protected] ";" | 2277 | [email protected] "\n " |
2315 | [email protected] "\n " | 2278 | [email protected] |
2316 | [email protected] | 2279 | [email protected] |
2317 | [email protected] | 2280 | [email protected] |
2318 | [email protected] | 2281 | [email protected] |
2319 | [email protected] | 2282 | [email protected] |
2320 | [email protected] | 2283 | [email protected] |
2321 | [email protected] | 2284 | [email protected] "ktulhu" |
2322 | [email protected] "ktulhu" | 2285 | [email protected] |
2323 | [email protected] | 2286 | [email protected] "(" |
2324 | [email protected] "(" | 2287 | [email protected] ")" |
2325 | [email protected] ")" | 2288 | [email protected] ";" |
2326 | [email protected] ";" | 2289 | [email protected] "\n" |
2327 | [email protected] "\n" | 2290 | [email protected] "}" |
2328 | [email protected] "}" | ||
2329 | [email protected] "\n" | 2291 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast index 8f616623b..a64a82e94 100644 --- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast +++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast | |||
@@ -76,18 +76,17 @@ [email protected] | |||
76 | [email protected] "," | 76 | [email protected] "," |
77 | [email protected] "\n" | 77 | [email protected] "\n" |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "{" |
80 | [email protected] "{" | 80 | [email protected] "\n " |
81 | [email protected] "\n " | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "\"\"" |
84 | [email protected] "\"\"" | 84 | [email protected] "." |
85 | [email protected] "." | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] "to_owned" |
87 | [email protected] "to_owned" | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] "(" |
89 | [email protected] "(" | 89 | [email protected] ")" |
90 | [email protected] ")" | 90 | [email protected] "\n" |
91 | [email protected] "\n" | 91 | [email protected] "}" |
92 | [email protected] "}" | ||
93 | [email protected] "\n" | 92 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast index 14d82feb0..7fd414090 100644 --- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast +++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast | |||
@@ -38,6 +38,5 @@ [email protected] | |||
38 | [email protected] "Foo" | 38 | [email protected] "Foo" |
39 | [email protected] " " | 39 | [email protected] " " |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "{" |
42 | [email protected] "{" | 42 | [email protected] "}" |
43 | [email protected] "}" | ||
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast index d38a60665..17be2c238 100644 --- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast | |||
@@ -9,8 +9,7 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n" |
14 | [email protected] "\n" | 14 | [email protected] "}" |
15 | [email protected] "}" | ||
16 | [email protected] "\n" | 15 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast index db25bc2b8..acf32a852 100644 --- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast +++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast | |||
@@ -9,42 +9,41 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] " " |
14 | [email protected] " " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "let" |
16 | [email protected] "let" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "r#struct" |
20 | [email protected] "r#struct" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "=" |
22 | [email protected] "=" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "92" |
25 | [email protected] "92" | 25 | [email protected] ";" |
26 | [email protected] ";" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "let" |
29 | [email protected] "let" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "r#trait" |
33 | [email protected] "r#trait" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] "=" |
35 | [email protected] "=" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "r#struct" |
42 | [email protected] "r#struct" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] "*" |
44 | [email protected] "*" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "2" |
47 | [email protected] "2" | 47 | [email protected] ";" |
48 | [email protected] ";" | 48 | [email protected] " " |
49 | [email protected] " " | 49 | [email protected] "}" |
50 | [email protected] "}" | ||
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index 9704bea95..468982b74 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast | |||
@@ -39,20 +39,19 @@ [email protected] | |||
39 | [email protected] "bool" | 39 | [email protected] "bool" |
40 | [email protected] " " | 40 | [email protected] " " |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "{" |
43 | [email protected] "{" | 43 | [email protected] "\n " |
44 | [email protected] "\n " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "unimplemented" |
49 | [email protected] "unimplemented" | 49 | [email protected] "!" |
50 | [email protected] "!" | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "(" |
52 | [email protected] "(" | 52 | [email protected] ")" |
53 | [email protected] ")" | 53 | [email protected] "\n " |
54 | [email protected] "\n " | 54 | [email protected] "}" |
55 | [email protected] "}" | ||
56 | [email protected] "\n" | 55 | [email protected] "\n" |
57 | [email protected] "}" | 56 | [email protected] "}" |
58 | [email protected] "\n\n" | 57 | [email protected] "\n\n" |
@@ -76,9 +75,8 @@ [email protected] | |||
76 | [email protected] ")" | 75 | [email protected] ")" |
77 | [email protected] " " | 76 | [email protected] " " |
78 | [email protected] | 77 | [email protected] |
79 | [email protected] | 78 | [email protected] "{" |
80 | [email protected] "{" | 79 | [email protected] "}" |
81 | [email protected] "}" | ||
82 | [email protected] "\n\n" | 80 | [email protected] "\n\n" |
83 | [email protected] | 81 | [email protected] |
84 | [email protected] "fn" | 82 | [email protected] "fn" |
@@ -90,37 +88,36 @@ [email protected] | |||
90 | [email protected] ")" | 88 | [email protected] ")" |
91 | [email protected] " " | 89 | [email protected] " " |
92 | [email protected] | 90 | [email protected] |
93 | [email protected] | 91 | [email protected] "{" |
94 | [email protected] "{" | 92 | [email protected] "\n " |
95 | [email protected] "\n " | 93 | [email protected] |
96 | [email protected] | 94 | [email protected] |
97 | [email protected] | 95 | [email protected] |
98 | [email protected] | 96 | [email protected] |
99 | [email protected] | 97 | [email protected] |
100 | [email protected] | 98 | [email protected] "baz" |
101 | [email protected] "baz" | 99 | [email protected] |
102 | [email protected] | 100 | [email protected] "(" |
103 | [email protected] "(" | 101 | [email protected] |
104 | [email protected] | 102 | [email protected] |
105 | [email protected] | 103 | [email protected] |
106 | [email protected] | 104 | [email protected] |
107 | [email protected] | 105 | [email protected] |
108 | [email protected] | 106 | [email protected] "<" |
109 | [email protected] "<" | 107 | [email protected] |
110 | [email protected] | 108 | [email protected] |
111 | [email protected] | 109 | [email protected] |
112 | [email protected] | 110 | [email protected] |
113 | [email protected] | 111 | [email protected] "Foo" |
114 | [email protected] "Foo" | 112 | [email protected] ">" |
115 | [email protected] ">" | 113 | [email protected] "::" |
116 | [email protected] "::" | 114 | [email protected] |
117 | [email protected] | 115 | [email protected] |
118 | [email protected] | 116 | [email protected] "bar" |
119 | [email protected] "bar" | 117 | [email protected] |
120 | [email protected] | 118 | [email protected] "(" |
121 | [email protected] "(" | 119 | [email protected] ")" |
122 | [email protected] ")" | 120 | [email protected] ")" |
123 | [email protected] ")" | 121 | [email protected] "\n" |
124 | [email protected] "\n" | 122 | [email protected] "}" |
125 | [email protected] "}" | ||
126 | [email protected] "\n" | 123 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast index 6e5b25748..900eeb445 100644 --- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast | |||
@@ -40,71 +40,70 @@ [email protected] | |||
40 | [email protected] ")" | 40 | [email protected] ")" |
41 | [email protected] " " | 41 | [email protected] " " |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "{" |
44 | [email protected] "{" | 44 | [email protected] "\n " |
45 | [email protected] "\n " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "Repr" |
54 | [email protected] "Repr" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "{" |
57 | [email protected] "{" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "raw" |
61 | [email protected] "raw" | 61 | [email protected] ":" |
62 | [email protected] ":" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "[" |
65 | [email protected] "[" | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] "0" |
67 | [email protected] "0" | 67 | [email protected] "]" |
68 | [email protected] "]" | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] "}" |
70 | [email protected] "}" | 70 | [email protected] "." |
71 | [email protected] "." | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "raw" |
73 | [email protected] "raw" | 73 | [email protected] "[" |
74 | [email protected] "[" | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] "0" |
76 | [email protected] "0" | 76 | [email protected] "]" |
77 | [email protected] "]" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] "=" |
79 | [email protected] "=" | 79 | [email protected] " " |
80 | [email protected] " " | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] "0" |
82 | [email protected] "0" | 82 | [email protected] ";" |
83 | [email protected] ";" | 83 | [email protected] "\n " |
84 | [email protected] "\n " | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] "Repr" |
91 | [email protected] "Repr" | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "{" |
93 | [email protected] "{" | 93 | [email protected] |
94 | [email protected] | 94 | [email protected] |
95 | [email protected] | 95 | [email protected] "raw" |
96 | [email protected] "raw" | 96 | [email protected] ":" |
97 | [email protected] ":" | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "[" |
99 | [email protected] "[" | 99 | [email protected] |
100 | [email protected] | 100 | [email protected] "0" |
101 | [email protected] "0" | 101 | [email protected] "]" |
102 | [email protected] "]" | 102 | [email protected] "}" |
103 | [email protected] "}" | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] "(" |
105 | [email protected] "(" | 105 | [email protected] ")" |
106 | [email protected] ")" | 106 | [email protected] ";" |
107 | [email protected] ";" | 107 | [email protected] "\n" |
108 | [email protected] "\n" | 108 | [email protected] "}" |
109 | [email protected] "}" | ||
110 | [email protected] "\n" | 109 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast index f1eef3be0..6d941487b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast | |||
@@ -11,66 +11,65 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "\n " |
16 | [email protected] "\n " | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "#" |
19 | [email protected] "#" | 19 | [email protected] "[" |
20 | [email protected] "[" | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "cfg" |
24 | [email protected] "cfg" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "(" |
26 | [email protected] "(" | 26 | [email protected] "feature" |
27 | [email protected] "feature" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] "=" |
29 | [email protected] "=" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "\"backtrace\"" |
31 | [email protected] "\"backtrace\"" | 31 | [email protected] ")" |
32 | [email protected] ")" | 32 | [email protected] "]" |
33 | [email protected] "]" | 33 | [email protected] "\n " |
34 | [email protected] "\n " | 34 | [email protected] "let" |
35 | [email protected] "let" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "exit_code" |
39 | [email protected] "exit_code" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] "=" |
41 | [email protected] "=" | 41 | [email protected] " " |
42 | [email protected] " " | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "panic" |
49 | [email protected] "panic" | 49 | [email protected] "::" |
50 | [email protected] "::" | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "catch_unwind" |
53 | [email protected] "catch_unwind" | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] "(" |
55 | [email protected] "(" | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "move" |
57 | [email protected] "move" | 57 | [email protected] " " |
58 | [email protected] " " | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "|" |
60 | [email protected] "|" | 60 | [email protected] "|" |
61 | [email protected] "|" | 61 | [email protected] " " |
62 | [email protected] " " | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] | 66 | [email protected] |
67 | [email protected] | 67 | [email protected] "main" |
68 | [email protected] "main" | 68 | [email protected] |
69 | [email protected] | 69 | [email protected] "(" |
70 | [email protected] "(" | 70 | [email protected] ")" |
71 | [email protected] ")" | 71 | [email protected] ")" |
72 | [email protected] ")" | 72 | [email protected] ";" |
73 | [email protected] ";" | 73 | [email protected] "\n" |
74 | [email protected] "\n" | 74 | [email protected] "}" |
75 | [email protected] "}" | ||
76 | [email protected] "\n" | 75 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index f79feec19..e8b095251 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast | |||
@@ -9,86 +9,83 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "#" |
16 | [email protected] "#" | 16 | [email protected] "!" |
17 | [email protected] "!" | 17 | [email protected] "[" |
18 | [email protected] "[" | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "doc" |
22 | [email protected] "doc" | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "(" |
24 | [email protected] "(" | 24 | [email protected] "\"Inner attributes all ..." |
25 | [email protected] "\"Inner attributes all ..." | 25 | [email protected] ")" |
26 | [email protected] ")" | 26 | [email protected] "]" |
27 | [email protected] "]" | 27 | [email protected] "\n " |
28 | [email protected] "\n " | 28 | [email protected] "//! As are ModuleDoc ..." |
29 | [email protected] "//! As are ModuleDoc ..." | 29 | [email protected] "\n " |
30 | [email protected] "\n " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "{" |
33 | [email protected] | 33 | [email protected] "\n " |
34 | [email protected] "{" | 34 | [email protected] |
35 | [email protected] "\n " | 35 | [email protected] "#" |
36 | [email protected] | 36 | [email protected] "!" |
37 | [email protected] "#" | 37 | [email protected] "[" |
38 | [email protected] "!" | 38 | [email protected] |
39 | [email protected] "[" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "doc" |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] "doc" | 43 | [email protected] "(" |
44 | [email protected] | 44 | [email protected] "\"Inner attributes are ..." |
45 | [email protected] "(" | 45 | [email protected] ")" |
46 | [email protected] "\"Inner attributes are ..." | 46 | [email protected] "]" |
47 | [email protected] ")" | 47 | [email protected] "\n " |
48 | [email protected] "]" | 48 | [email protected] |
49 | [email protected] "\n " | 49 | [email protected] "#" |
50 | [email protected] | 50 | [email protected] "!" |
51 | [email protected] "#" | 51 | [email protected] "[" |
52 | [email protected] "!" | 52 | [email protected] |
53 | [email protected] "[" | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "doc" |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] "doc" | 57 | [email protected] "(" |
58 | [email protected] | 58 | [email protected] "\"Being validated is n ..." |
59 | [email protected] "(" | 59 | [email protected] ")" |
60 | [email protected] "\"Being validated is n ..." | 60 | [email protected] "]" |
61 | [email protected] ")" | 61 | [email protected] "\n " |
62 | [email protected] "]" | 62 | [email protected] "//! As are ModuleDoc ..." |
63 | [email protected] "\n " | 63 | [email protected] "\n " |
64 | [email protected] "//! As are ModuleDoc ..." | 64 | [email protected] "}" |
65 | [email protected] "\n " | 65 | [email protected] ";" |
66 | [email protected] "}" | 66 | [email protected] "\n " |
67 | [email protected] ";" | 67 | [email protected] |
68 | [email protected] "\n " | 68 | [email protected] "{" |
69 | [email protected] | 69 | [email protected] "\n " |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] "{" | 71 | [email protected] "#" |
72 | [email protected] "\n " | 72 | [email protected] "!" |
73 | [email protected] | 73 | [email protected] "[" |
74 | [email protected] "#" | 74 | [email protected] |
75 | [email protected] "!" | 75 | [email protected] |
76 | [email protected] "[" | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "doc" |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "(" |
80 | [email protected] "doc" | 80 | [email protected] "\"Inner attributes are ..." |
81 | [email protected] | 81 | [email protected] ")" |
82 | [email protected] "(" | 82 | [email protected] "]" |
83 | [email protected] "\"Inner attributes are ..." | 83 | [email protected] "\n " |
84 | [email protected] ")" | 84 | [email protected] "//! As are ModuleDoc ..." |
85 | [email protected] "]" | 85 | [email protected] "\n " |
86 | [email protected] "\n " | 86 | [email protected] "}" |
87 | [email protected] "//! As are ModuleDoc ..." | 87 | [email protected] "\n" |
88 | [email protected] "\n " | 88 | [email protected] "}" |
89 | [email protected] "}" | ||
90 | [email protected] "\n" | ||
91 | [email protected] "}" | ||
92 | [email protected] "\n\n" | 89 | [email protected] "\n\n" |
93 | [email protected] "// https://github.com ..." | 90 | [email protected] "// https://github.com ..." |
94 | [email protected] "\n" | 91 | [email protected] "\n" |
@@ -156,26 +153,25 @@ [email protected] | |||
156 | [email protected] ")" | 153 | [email protected] ")" |
157 | [email protected] " " | 154 | [email protected] " " |
158 | [email protected] | 155 | [email protected] |
159 | [email protected] | 156 | [email protected] "{" |
160 | [email protected] "{" | 157 | [email protected] "\n " |
161 | [email protected] "\n " | 158 | [email protected] |
162 | [email protected] | 159 | [email protected] "#" |
163 | [email protected] "#" | 160 | [email protected] "!" |
164 | [email protected] "!" | 161 | [email protected] "[" |
165 | [email protected] "[" | 162 | [email protected] |
166 | [email protected] | 163 | [email protected] |
167 | [email protected] | 164 | [email protected] |
168 | [email protected] | 165 | [email protected] "allow" |
169 | [email protected] "allow" | 166 | [email protected] |
170 | [email protected] | 167 | [email protected] "(" |
171 | [email protected] "(" | 168 | [email protected] "unused_variables" |
172 | [email protected] "unused_variables" | 169 | [email protected] ")" |
173 | [email protected] ")" | 170 | [email protected] "]" |
174 | [email protected] "]" | 171 | [email protected] " " |
175 | [email protected] " " | 172 | [email protected] "// this is `inner_at ..." |
176 | [email protected] "// this is `inner_at ..." | 173 | [email protected] "\n " |
177 | [email protected] "\n " | 174 | [email protected] "}" |
178 | [email protected] "}" | ||
179 | [email protected] "\n" | 175 | [email protected] "\n" |
180 | [email protected] "}" | 176 | [email protected] "}" |
181 | [email protected] "\n" | 177 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast index 1cf12d670..38e44e48a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast | |||
@@ -11,252 +11,250 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "\n " |
16 | [email protected] "\n " | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "match" |
19 | [email protected] "match" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "Some" |
26 | [email protected] "Some" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "(" |
28 | [email protected] "(" | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] "-" |
30 | [email protected] "-" | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "1" |
32 | [email protected] "1" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] " " |
34 | [email protected] " " | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "{" |
36 | [email protected] "{" | 36 | [email protected] "\n " |
37 | [email protected] "\n " | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "Some" |
43 | [email protected] "Some" | 43 | [email protected] "(" |
44 | [email protected] "(" | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "-" |
46 | [email protected] "-" | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] "1" |
48 | [email protected] "1" | 48 | [email protected] ")" |
49 | [email protected] ")" | 49 | [email protected] " " |
50 | [email protected] " " | 50 | [email protected] "=>" |
51 | [email protected] "=>" | 51 | [email protected] " " |
52 | [email protected] " " | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "(" |
54 | [email protected] "(" | 54 | [email protected] ")" |
55 | [email protected] ")" | 55 | [email protected] "," |
56 | [email protected] "," | 56 | [email protected] "\n " |
57 | [email protected] "\n " | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] "_" |
60 | [email protected] "_" | 60 | [email protected] " " |
61 | [email protected] " " | 61 | [email protected] "=>" |
62 | [email protected] "=>" | 62 | [email protected] " " |
63 | [email protected] " " | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] "(" |
65 | [email protected] "(" | 65 | [email protected] ")" |
66 | [email protected] ")" | 66 | [email protected] "," |
67 | [email protected] "," | 67 | [email protected] "\n " |
68 | [email protected] "\n " | 68 | [email protected] "}" |
69 | [email protected] "}" | 69 | [email protected] "\n\n " |
70 | [email protected] "\n\n " | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] |
72 | [email protected] | 72 | [email protected] "match" |
73 | [email protected] "match" | 73 | [email protected] " " |
74 | [email protected] " " | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "Some" |
80 | [email protected] "Some" | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] "(" |
82 | [email protected] "(" | 82 | [email protected] |
83 | [email protected] | 83 | [email protected] "(" |
84 | [email protected] "(" | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] "-" |
86 | [email protected] "-" | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "1" |
88 | [email protected] "1" | 88 | [email protected] "," |
89 | [email protected] "," | 89 | [email protected] " " |
90 | [email protected] " " | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] "-" |
92 | [email protected] "-" | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "1" |
94 | [email protected] "1" | 94 | [email protected] ")" |
95 | [email protected] ")" | 95 | [email protected] ")" |
96 | [email protected] ")" | 96 | [email protected] " " |
97 | [email protected] " " | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "{" |
99 | [email protected] "{" | 99 | [email protected] "\n " |
100 | [email protected] "\n " | 100 | [email protected] |
101 | [email protected] | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] "Some" |
106 | [email protected] "Some" | 106 | [email protected] "(" |
107 | [email protected] "(" | 107 | [email protected] |
108 | [email protected] | 108 | [email protected] "(" |
109 | [email protected] "(" | 109 | [email protected] |
110 | [email protected] | 110 | [email protected] "-" |
111 | [email protected] "-" | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] "1" |
113 | [email protected] "1" | 113 | [email protected] "," |
114 | [email protected] "," | 114 | [email protected] " " |
115 | [email protected] " " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] "-" |
117 | [email protected] "-" | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] "1" |
119 | [email protected] "1" | 119 | [email protected] ")" |
120 | [email protected] ")" | 120 | [email protected] ")" |
121 | [email protected] ")" | 121 | [email protected] " " |
122 | [email protected] " " | 122 | [email protected] "=>" |
123 | [email protected] "=>" | 123 | [email protected] " " |
124 | [email protected] " " | 124 | [email protected] |
125 | [email protected] | 125 | [email protected] "(" |
126 | [email protected] "(" | 126 | [email protected] ")" |
127 | [email protected] ")" | 127 | [email protected] "," |
128 | [email protected] "," | 128 | [email protected] "\n " |
129 | [email protected] "\n " | 129 | [email protected] |
130 | [email protected] | 130 | [email protected] |
131 | [email protected] | 131 | [email protected] "_" |
132 | [email protected] "_" | 132 | [email protected] " " |
133 | [email protected] " " | 133 | [email protected] "=>" |
134 | [email protected] "=>" | 134 | [email protected] " " |
135 | [email protected] " " | 135 | [email protected] |
136 | [email protected] | 136 | [email protected] "(" |
137 | [email protected] "(" | 137 | [email protected] ")" |
138 | [email protected] ")" | 138 | [email protected] "," |
139 | [email protected] "," | 139 | [email protected] "\n " |
140 | [email protected] "\n " | 140 | [email protected] "}" |
141 | [email protected] "}" | 141 | [email protected] "\n\n " |
142 | [email protected] "\n\n " | 142 | [email protected] |
143 | [email protected] | 143 | [email protected] |
144 | [email protected] | 144 | [email protected] "match" |
145 | [email protected] "match" | 145 | [email protected] " " |
146 | [email protected] " " | 146 | [email protected] |
147 | [email protected] | 147 | [email protected] |
148 | [email protected] | 148 | [email protected] |
149 | [email protected] | 149 | [email protected] |
150 | [email protected] | 150 | [email protected] |
151 | [email protected] | 151 | [email protected] |
152 | [email protected] | 152 | [email protected] "A" |
153 | [email protected] "A" | 153 | [email protected] "::" |
154 | [email protected] "::" | 154 | [email protected] |
155 | [email protected] | 155 | [email protected] |
156 | [email protected] | 156 | [email protected] "B" |
157 | [email protected] "B" | 157 | [email protected] |
158 | [email protected] | 158 | [email protected] "(" |
159 | [email protected] "(" | 159 | [email protected] |
160 | [email protected] | 160 | [email protected] "-" |
161 | [email protected] "-" | 161 | [email protected] |
162 | [email protected] | 162 | [email protected] "1" |
163 | [email protected] "1" | 163 | [email protected] "," |
164 | [email protected] "," | 164 | [email protected] " " |
165 | [email protected] " " | 165 | [email protected] |
166 | [email protected] | 166 | [email protected] "-" |
167 | [email protected] "-" | 167 | [email protected] |
168 | [email protected] | 168 | [email protected] "1" |
169 | [email protected] "1" | 169 | [email protected] ")" |
170 | [email protected] ")" | 170 | [email protected] " " |
171 | [email protected] " " | 171 | [email protected] |
172 | [email protected] | 172 | [email protected] "{" |
173 | [email protected] "{" | 173 | [email protected] "\n " |
174 | [email protected] "\n " | 174 | [email protected] |
175 | [email protected] | 175 | [email protected] |
176 | [email protected] | 176 | [email protected] |
177 | [email protected] | 177 | [email protected] |
178 | [email protected] | 178 | [email protected] |
179 | [email protected] | 179 | [email protected] |
180 | [email protected] | 180 | [email protected] "A" |
181 | [email protected] "A" | 181 | [email protected] "::" |
182 | [email protected] "::" | 182 | [email protected] |
183 | [email protected] | 183 | [email protected] |
184 | [email protected] | 184 | [email protected] "B" |
185 | [email protected] "B" | 185 | [email protected] "(" |
186 | [email protected] "(" | 186 | [email protected] |
187 | [email protected] | 187 | [email protected] "-" |
188 | [email protected] "-" | 188 | [email protected] |
189 | [email protected] | 189 | [email protected] "1" |
190 | [email protected] "1" | 190 | [email protected] "," |
191 | [email protected] "," | 191 | [email protected] " " |
192 | [email protected] " " | 192 | [email protected] |
193 | [email protected] | 193 | [email protected] "-" |
194 | [email protected] "-" | 194 | [email protected] |
195 | [email protected] | 195 | [email protected] "1" |
196 | [email protected] "1" | 196 | [email protected] ")" |
197 | [email protected] ")" | 197 | [email protected] " " |
198 | [email protected] " " | 198 | [email protected] "=>" |
199 | [email protected] "=>" | 199 | [email protected] " " |
200 | [email protected] " " | 200 | [email protected] |
201 | [email protected] | 201 | [email protected] "(" |
202 | [email protected] "(" | 202 | [email protected] ")" |
203 | [email protected] ")" | 203 | [email protected] "," |
204 | [email protected] "," | 204 | [email protected] "\n " |
205 | [email protected] "\n " | 205 | [email protected] |
206 | [email protected] | 206 | [email protected] |
207 | [email protected] | 207 | [email protected] "_" |
208 | [email protected] "_" | 208 | [email protected] " " |
209 | [email protected] " " | 209 | [email protected] "=>" |
210 | [email protected] "=>" | 210 | [email protected] " " |
211 | [email protected] " " | 211 | [email protected] |
212 | [email protected] | 212 | [email protected] "(" |
213 | [email protected] "(" | 213 | [email protected] ")" |
214 | [email protected] ")" | 214 | [email protected] "," |
215 | [email protected] "," | 215 | [email protected] "\n " |
216 | [email protected] "\n " | 216 | [email protected] "}" |
217 | [email protected] "}" | 217 | [email protected] "\n\n " |
218 | [email protected] "\n\n " | 218 | [email protected] |
219 | [email protected] | 219 | [email protected] "if" |
220 | [email protected] "if" | 220 | [email protected] " " |
221 | [email protected] " " | 221 | [email protected] |
222 | [email protected] | 222 | [email protected] "let" |
223 | [email protected] "let" | 223 | [email protected] " " |
224 | [email protected] " " | 224 | [email protected] |
225 | [email protected] | 225 | [email protected] |
226 | [email protected] | 226 | [email protected] |
227 | [email protected] | 227 | [email protected] |
228 | [email protected] | 228 | [email protected] "Some" |
229 | [email protected] "Some" | 229 | [email protected] "(" |
230 | [email protected] "(" | 230 | [email protected] |
231 | [email protected] | 231 | [email protected] "-" |
232 | [email protected] "-" | 232 | [email protected] |
233 | [email protected] | 233 | [email protected] "1" |
234 | [email protected] "1" | 234 | [email protected] ")" |
235 | [email protected] ")" | 235 | [email protected] " " |
236 | [email protected] " " | 236 | [email protected] "=" |
237 | [email protected] "=" | 237 | [email protected] " " |
238 | [email protected] " " | 238 | [email protected] |
239 | [email protected] | 239 | [email protected] |
240 | [email protected] | 240 | [email protected] |
241 | [email protected] | 241 | [email protected] |
242 | [email protected] | 242 | [email protected] |
243 | [email protected] | 243 | [email protected] "Some" |
244 | [email protected] "Some" | 244 | [email protected] |
245 | [email protected] | 245 | [email protected] "(" |
246 | [email protected] "(" | 246 | [email protected] |
247 | [email protected] | 247 | [email protected] "-" |
248 | [email protected] "-" | 248 | [email protected] |
249 | [email protected] | 249 | [email protected] "1" |
250 | [email protected] "1" | 250 | [email protected] ")" |
251 | [email protected] ")" | 251 | [email protected] " " |
252 | [email protected] " " | 252 | [email protected] |
253 | [email protected] | 253 | [email protected] "{" |
254 | [email protected] | 254 | [email protected] "\n " |
255 | [email protected] "{" | 255 | [email protected] "}" |
256 | [email protected] "\n " | 256 | [email protected] "\n" |
257 | [email protected] "}" | 257 | [email protected] "}" |
258 | [email protected] "\n" | ||
259 | [email protected] "}" | ||
260 | [email protected] "\n\n" | 258 | [email protected] "\n\n" |
261 | [email protected] | 259 | [email protected] |
262 | [email protected] "enum" | 260 | [email protected] "enum" |
@@ -317,7 +315,6 @@ [email protected] | |||
317 | [email protected] ")" | 315 | [email protected] ")" |
318 | [email protected] " " | 316 | [email protected] " " |
319 | [email protected] | 317 | [email protected] |
320 | [email protected] | 318 | [email protected] "{" |
321 | [email protected] "{" | 319 | [email protected] "}" |
322 | [email protected] "}" | ||
323 | [email protected] "\n" | 320 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast index 9c2701bf7..28233c5d0 100644 --- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast | |||
@@ -11,191 +11,190 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "\n " |
16 | [email protected] "\n " | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] "let" |
18 | [email protected] "let" | 18 | [email protected] " " |
19 | [email protected] " " | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "mut" |
21 | [email protected] "mut" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "a" |
24 | [email protected] "a" | 24 | [email protected] " " |
25 | [email protected] " " | 25 | [email protected] "=" |
26 | [email protected] "=" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "0" |
29 | [email protected] "0" | 29 | [email protected] ";" |
30 | [email protected] ";" | 30 | [email protected] "\n " |
31 | [email protected] "\n " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "a" |
38 | [email protected] "a" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] "+=" |
40 | [email protected] "+=" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "1" |
43 | [email protected] "1" | 43 | [email protected] ";" |
44 | [email protected] ";" | 44 | [email protected] "\n " |
45 | [email protected] "\n " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] "a" |
52 | [email protected] "a" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] "-=" |
54 | [email protected] "-=" | 54 | [email protected] " " |
55 | [email protected] " " | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "2" |
57 | [email protected] "2" | 57 | [email protected] ";" |
58 | [email protected] ";" | 58 | [email protected] "\n " |
59 | [email protected] "\n " | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "a" |
66 | [email protected] "a" | 66 | [email protected] " " |
67 | [email protected] " " | 67 | [email protected] "*=" |
68 | [email protected] "*=" | 68 | [email protected] " " |
69 | [email protected] " " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] "3" |
71 | [email protected] "3" | 71 | [email protected] ";" |
72 | [email protected] ";" | 72 | [email protected] "\n " |
73 | [email protected] "\n " | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "a" |
80 | [email protected] "a" | 80 | [email protected] " " |
81 | [email protected] " " | 81 | [email protected] "%=" |
82 | [email protected] "%=" | 82 | [email protected] " " |
83 | [email protected] " " | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "4" |
85 | [email protected] "4" | 85 | [email protected] ";" |
86 | [email protected] ";" | 86 | [email protected] "\n " |
87 | [email protected] "\n " | 87 | [email protected] |
88 | [email protected] | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] |
90 | [email protected] | 90 | [email protected] |
91 | [email protected] | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] "a" |
94 | [email protected] "a" | 94 | [email protected] " " |
95 | [email protected] " " | 95 | [email protected] "/=" |
96 | [email protected] "/=" | 96 | [email protected] " " |
97 | [email protected] " " | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "5" |
99 | [email protected] "5" | 99 | [email protected] ";" |
100 | [email protected] ";" | 100 | [email protected] "\n " |
101 | [email protected] "\n " | 101 | [email protected] |
102 | [email protected] | 102 | [email protected] |
103 | [email protected] | 103 | [email protected] |
104 | [email protected] | 104 | [email protected] |
105 | [email protected] | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] |
107 | [email protected] | 107 | [email protected] "a" |
108 | [email protected] "a" | 108 | [email protected] " " |
109 | [email protected] " " | 109 | [email protected] "|=" |
110 | [email protected] "|=" | 110 | [email protected] " " |
111 | [email protected] " " | 111 | [email protected] |
112 | [email protected] | 112 | [email protected] "6" |
113 | [email protected] "6" | 113 | [email protected] ";" |
114 | [email protected] ";" | 114 | [email protected] "\n " |
115 | [email protected] "\n " | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] |
117 | [email protected] | 117 | [email protected] |
118 | [email protected] | 118 | [email protected] |
119 | [email protected] | 119 | [email protected] |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] "a" |
122 | [email protected] "a" | 122 | [email protected] " " |
123 | [email protected] " " | 123 | [email protected] "&=" |
124 | [email protected] "&=" | 124 | [email protected] " " |
125 | [email protected] " " | 125 | [email protected] |
126 | [email protected] | 126 | [email protected] "7" |
127 | [email protected] "7" | 127 | [email protected] ";" |
128 | [email protected] ";" | 128 | [email protected] "\n " |
129 | [email protected] "\n " | 129 | [email protected] |
130 | [email protected] | 130 | [email protected] |
131 | [email protected] | 131 | [email protected] |
132 | [email protected] | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] |
134 | [email protected] | 134 | [email protected] |
135 | [email protected] | 135 | [email protected] "a" |
136 | [email protected] "a" | 136 | [email protected] " " |
137 | [email protected] " " | 137 | [email protected] "^=" |
138 | [email protected] "^=" | 138 | [email protected] " " |
139 | [email protected] " " | 139 | [email protected] |
140 | [email protected] | 140 | [email protected] "8" |
141 | [email protected] "8" | 141 | [email protected] ";" |
142 | [email protected] ";" | 142 | [email protected] "\n " |
143 | [email protected] "\n " | 143 | [email protected] |
144 | [email protected] | 144 | [email protected] |
145 | [email protected] | 145 | [email protected] |
146 | [email protected] | 146 | [email protected] |
147 | [email protected] | 147 | [email protected] |
148 | [email protected] | 148 | [email protected] |
149 | [email protected] | 149 | [email protected] "a" |
150 | [email protected] "a" | 150 | [email protected] " " |
151 | [email protected] " " | 151 | [email protected] "<=" |
152 | [email protected] "<=" | 152 | [email protected] " " |
153 | [email protected] " " | 153 | [email protected] |
154 | [email protected] | 154 | [email protected] "9" |
155 | [email protected] "9" | 155 | [email protected] ";" |
156 | [email protected] ";" | 156 | [email protected] "\n " |
157 | [email protected] "\n " | 157 | [email protected] |
158 | [email protected] | 158 | [email protected] |
159 | [email protected] | 159 | [email protected] |
160 | [email protected] | 160 | [email protected] |
161 | [email protected] | 161 | [email protected] |
162 | [email protected] | 162 | [email protected] |
163 | [email protected] | 163 | [email protected] "a" |
164 | [email protected] "a" | 164 | [email protected] " " |
165 | [email protected] " " | 165 | [email protected] ">=" |
166 | [email protected] ">=" | 166 | [email protected] " " |
167 | [email protected] " " | 167 | [email protected] |
168 | [email protected] | 168 | [email protected] "10" |
169 | [email protected] "10" | 169 | [email protected] ";" |
170 | [email protected] ";" | 170 | [email protected] "\n " |
171 | [email protected] "\n " | 171 | [email protected] |
172 | [email protected] | 172 | [email protected] |
173 | [email protected] | 173 | [email protected] |
174 | [email protected] | 174 | [email protected] |
175 | [email protected] | 175 | [email protected] |
176 | [email protected] | 176 | [email protected] |
177 | [email protected] | 177 | [email protected] "a" |
178 | [email protected] "a" | 178 | [email protected] " " |
179 | [email protected] " " | 179 | [email protected] ">>=" |
180 | [email protected] ">>=" | 180 | [email protected] " " |
181 | [email protected] " " | 181 | [email protected] |
182 | [email protected] | 182 | [email protected] "11" |
183 | [email protected] "11" | 183 | [email protected] ";" |
184 | [email protected] ";" | 184 | [email protected] "\n " |
185 | [email protected] "\n " | 185 | [email protected] |
186 | [email protected] | 186 | [email protected] |
187 | [email protected] | 187 | [email protected] |
188 | [email protected] | 188 | [email protected] |
189 | [email protected] | 189 | [email protected] |
190 | [email protected] | 190 | [email protected] |
191 | [email protected] | 191 | [email protected] "a" |
192 | [email protected] "a" | 192 | [email protected] " " |
193 | [email protected] " " | 193 | [email protected] "<<=" |
194 | [email protected] "<<=" | 194 | [email protected] " " |
195 | [email protected] " " | 195 | [email protected] |
196 | [email protected] | 196 | [email protected] "12" |
197 | [email protected] "12" | 197 | [email protected] ";" |
198 | [email protected] ";" | 198 | [email protected] "\n" |
199 | [email protected] "\n" | 199 | [email protected] "}" |
200 | [email protected] "}" | ||
201 | [email protected] "\n" | 200 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast index 750527bb9..0569488f8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast | |||
@@ -9,28 +9,27 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] "async" |
17 | [email protected] "async" | 17 | [email protected] " " |
18 | [email protected] " " | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "{" |
20 | [email protected] "{" | 20 | [email protected] "}" |
21 | [email protected] "}" | 21 | [email protected] ";" |
22 | [email protected] ";" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "async" |
26 | [email protected] "async" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] "move" |
28 | [email protected] "move" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] "{" |
31 | [email protected] "{" | 31 | [email protected] "}" |
32 | [email protected] "}" | 32 | [email protected] ";" |
33 | [email protected] ";" | 33 | [email protected] "\n" |
34 | [email protected] "\n" | 34 | [email protected] "}" |
35 | [email protected] "}" | ||
36 | [email protected] "\n\n" | 35 | [email protected] "\n\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast index b5577e933..7847da085 100644 --- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast +++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast | |||
@@ -49,9 +49,8 @@ [email protected] | |||
49 | [email protected] ")" | 49 | [email protected] ")" |
50 | [email protected] " " | 50 | [email protected] " " |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] "{" |
53 | [email protected] "{" | 53 | [email protected] "}" |
54 | [email protected] "}" | ||
55 | [email protected] "\n\n" | 54 | [email protected] "\n\n" |
56 | [email protected] | 55 | [email protected] |
57 | [email protected] "fn" | 56 | [email protected] "fn" |
@@ -63,30 +62,29 @@ [email protected] | |||
63 | [email protected] ")" | 62 | [email protected] ")" |
64 | [email protected] " " | 63 | [email protected] " " |
65 | [email protected] | 64 | [email protected] |
66 | [email protected] | 65 | [email protected] "{" |
67 | [email protected] "{" | 66 | [email protected] "\n " |
68 | [email protected] "\n " | 67 | [email protected] |
69 | [email protected] | 68 | [email protected] |
70 | [email protected] | 69 | [email protected] |
71 | [email protected] | 70 | [email protected] |
72 | [email protected] | 71 | [email protected] |
73 | [email protected] | 72 | [email protected] "foo" |
74 | [email protected] "foo" | 73 | [email protected] |
75 | [email protected] | 74 | [email protected] "(" |
76 | [email protected] "(" | 75 | [email protected] |
77 | [email protected] | 76 | [email protected] "async" |
78 | [email protected] "async" | 77 | [email protected] " " |
79 | [email protected] " " | 78 | [email protected] "move" |
80 | [email protected] "move" | 79 | [email protected] " " |
81 | [email protected] " " | 80 | [email protected] |
82 | [email protected] | 81 | [email protected] "{" |
83 | [email protected] "{" | 82 | [email protected] " " |
84 | [email protected] " " | 83 | [email protected] |
85 | [email protected] | 84 | [email protected] "12" |
86 | [email protected] "12" | 85 | [email protected] " " |
87 | [email protected] " " | 86 | [email protected] "}" |
88 | [email protected] "}" | 87 | [email protected] ")" |
89 | [email protected] ")" | 88 | [email protected] "\n" |
90 | [email protected] "\n" | 89 | [email protected] "}" |
91 | [email protected] "}" | ||
92 | [email protected] "\n" | 90 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 6aacc2141..816740a7c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast | |||
@@ -38,9 +38,8 @@ [email protected] | |||
38 | [email protected] ")" | 38 | [email protected] ")" |
39 | [email protected] " " | 39 | [email protected] " " |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "{" |
42 | [email protected] "{" | 42 | [email protected] "}" |
43 | [email protected] "}" | ||
44 | [email protected] "\n" | 43 | [email protected] "\n" |
45 | [email protected] | 44 | [email protected] |
46 | [email protected] "fn" | 45 | [email protected] "fn" |
@@ -72,9 +71,8 @@ [email protected] | |||
72 | [email protected] ")" | 71 | [email protected] ")" |
73 | [email protected] " " | 72 | [email protected] " " |
74 | [email protected] | 73 | [email protected] |
75 | [email protected] | 74 | [email protected] "{" |
76 | [email protected] "{" | 75 | [email protected] "}" |
77 | [email protected] "}" | ||
78 | [email protected] "\n\n" | 76 | [email protected] "\n\n" |
79 | [email protected] | 77 | [email protected] |
80 | [email protected] | 78 | [email protected] |
@@ -185,9 +183,8 @@ [email protected] | |||
185 | [email protected] "(" | 183 | [email protected] "(" |
186 | [email protected] ")" | 184 | [email protected] ")" |
187 | [email protected] | 185 | [email protected] |
188 | [email protected] | 186 | [email protected] "{" |
189 | [email protected] "{" | 187 | [email protected] "}" |
190 | [email protected] "}" | ||
191 | [email protected] "\n\n" | 188 | [email protected] "\n\n" |
192 | [email protected] | 189 | [email protected] |
193 | [email protected] "trait" | 190 | [email protected] "trait" |
@@ -287,9 +284,8 @@ [email protected] | |||
287 | [email protected] ")" | 284 | [email protected] ")" |
288 | [email protected] " " | 285 | [email protected] " " |
289 | [email protected] | 286 | [email protected] |
290 | [email protected] | 287 | [email protected] "{" |
291 | [email protected] "{" | 288 | [email protected] "}" |
292 | [email protected] "}" | ||
293 | [email protected] "\n " | 289 | [email protected] "\n " |
294 | [email protected] | 290 | [email protected] |
295 | [email protected] "fn" | 291 | [email protected] "fn" |
@@ -312,9 +308,8 @@ [email protected] | |||
312 | [email protected] ")" | 308 | [email protected] ")" |
313 | [email protected] " " | 309 | [email protected] " " |
314 | [email protected] | 310 | [email protected] |
315 | [email protected] | 311 | [email protected] "{" |
316 | [email protected] "{" | 312 | [email protected] "}" |
317 | [email protected] "}" | ||
318 | [email protected] "\n " | 313 | [email protected] "\n " |
319 | [email protected] | 314 | [email protected] |
320 | [email protected] "fn" | 315 | [email protected] "fn" |
@@ -338,9 +333,8 @@ [email protected] | |||
338 | [email protected] ")" | 333 | [email protected] ")" |
339 | [email protected] " " | 334 | [email protected] " " |
340 | [email protected] | 335 | [email protected] |
341 | [email protected] | 336 | [email protected] "{" |
342 | [email protected] "{" | 337 | [email protected] "}" |
343 | [email protected] "}" | ||
344 | [email protected] "\n " | 338 | [email protected] "\n " |
345 | [email protected] | 339 | [email protected] |
346 | [email protected] "fn" | 340 | [email protected] "fn" |
@@ -371,9 +365,8 @@ [email protected] | |||
371 | [email protected] ")" | 365 | [email protected] ")" |
372 | [email protected] " " | 366 | [email protected] " " |
373 | [email protected] | 367 | [email protected] |
374 | [email protected] | 368 | [email protected] "{" |
375 | [email protected] "{" | 369 | [email protected] "}" |
376 | [email protected] "}" | ||
377 | [email protected] "\n " | 370 | [email protected] "\n " |
378 | [email protected] | 371 | [email protected] |
379 | [email protected] "fn" | 372 | [email protected] "fn" |
@@ -404,9 +397,8 @@ [email protected] | |||
404 | [email protected] ")" | 397 | [email protected] ")" |
405 | [email protected] " " | 398 | [email protected] " " |
406 | [email protected] | 399 | [email protected] |
407 | [email protected] | 400 | [email protected] "{" |
408 | [email protected] "{" | 401 | [email protected] "}" |
409 | [email protected] "}" | ||
410 | [email protected] "\n " | 402 | [email protected] "\n " |
411 | [email protected] | 403 | [email protected] |
412 | [email protected] "fn" | 404 | [email protected] "fn" |
@@ -439,9 +431,8 @@ [email protected] | |||
439 | [email protected] ")" | 431 | [email protected] ")" |
440 | [email protected] " " | 432 | [email protected] " " |
441 | [email protected] | 433 | [email protected] |
442 | [email protected] | 434 | [email protected] "{" |
443 | [email protected] "{" | 435 | [email protected] "}" |
444 | [email protected] "}" | ||
445 | [email protected] "\n " | 436 | [email protected] "\n " |
446 | [email protected] | 437 | [email protected] |
447 | [email protected] "fn" | 438 | [email protected] "fn" |
@@ -471,9 +462,8 @@ [email protected] | |||
471 | [email protected] ")" | 462 | [email protected] ")" |
472 | [email protected] " " | 463 | [email protected] " " |
473 | [email protected] | 464 | [email protected] |
474 | [email protected] | 465 | [email protected] "{" |
475 | [email protected] "{" | 466 | [email protected] "}" |
476 | [email protected] "}" | ||
477 | [email protected] "\n " | 467 | [email protected] "\n " |
478 | [email protected] | 468 | [email protected] |
479 | [email protected] "fn" | 469 | [email protected] "fn" |
@@ -512,8 +502,7 @@ [email protected] | |||
512 | [email protected] ")" | 502 | [email protected] ")" |
513 | [email protected] " " | 503 | [email protected] " " |
514 | [email protected] | 504 | [email protected] |
515 | [email protected] | 505 | [email protected] "{" |
516 | [email protected] "{" | 506 | [email protected] "}" |
517 | [email protected] "}" | ||
518 | [email protected] "\n" | 507 | [email protected] "\n" |
519 | [email protected] "}" | 508 | [email protected] "}" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast index f376f86a7..65cfa7bc5 100644 --- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast | |||
@@ -9,73 +9,70 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "for" |
16 | [email protected] "for" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] "_x" |
20 | [email protected] "_x" | 20 | [email protected] " " |
21 | [email protected] " " | 21 | [email protected] "in" |
22 | [email protected] "in" | 22 | [email protected] " " |
23 | [email protected] " " | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "0" |
26 | [email protected] "0" | 26 | [email protected] " " |
27 | [email protected] " " | 27 | [email protected] ".." |
28 | [email protected] ".." | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] "0" |
35 | [email protected] "0" | 35 | [email protected] " " |
36 | [email protected] " " | 36 | [email protected] ".." |
37 | [email protected] ".." | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "{" |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] "{" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "1" |
43 | [email protected] | 43 | [email protected] " " |
44 | [email protected] "1" | 44 | [email protected] "+" |
45 | [email protected] " " | 45 | [email protected] " " |
46 | [email protected] "+" | 46 | [email protected] |
47 | [email protected] " " | 47 | [email protected] "2" |
48 | [email protected] | 48 | [email protected] "}" |
49 | [email protected] "2" | 49 | [email protected] ")" |
50 | [email protected] "}" | 50 | [email protected] "." |
51 | [email protected] ")" | 51 | [email protected] |
52 | [email protected] "." | 52 | [email protected] "sum" |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] "sum" | 54 | [email protected] "::" |
55 | [email protected] | 55 | [email protected] "<" |
56 | [email protected] "::" | 56 | [email protected] |
57 | [email protected] "<" | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "u32" |
62 | [email protected] | 62 | [email protected] ">" |
63 | [email protected] "u32" | 63 | [email protected] |
64 | [email protected] ">" | 64 | [email protected] "(" |
65 | [email protected] | 65 | [email protected] ")" |
66 | [email protected] "(" | 66 | [email protected] " " |
67 | [email protected] ")" | 67 | [email protected] |
68 | [email protected] " " | 68 | [email protected] "{" |
69 | [email protected] | 69 | [email protected] "\n " |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] "{" | 71 | [email protected] |
72 | [email protected] "\n " | 72 | [email protected] "break" |
73 | [email protected] | 73 | [email protected] ";" |
74 | [email protected] | 74 | [email protected] "\n " |
75 | [email protected] "break" | 75 | [email protected] "}" |
76 | [email protected] ";" | 76 | [email protected] "\n" |
77 | [email protected] "\n " | 77 | [email protected] "}" |
78 | [email protected] "}" | ||
79 | [email protected] "\n" | ||
80 | [email protected] "}" | ||
81 | [email protected] "\n" | 78 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index f20819bd2..d6aec7ab9 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast | |||
@@ -32,9 +32,8 @@ [email protected] | |||
32 | [email protected] ">" | 32 | [email protected] ">" |
33 | [email protected] " " | 33 | [email protected] " " |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "{" |
36 | [email protected] "{" | 36 | [email protected] "}" |
37 | [email protected] "}" | ||
38 | [email protected] "\n\n" | 37 | [email protected] "\n\n" |
39 | [email protected] | 38 | [email protected] |
40 | [email protected] "fn" | 39 | [email protected] "fn" |
@@ -75,9 +74,8 @@ [email protected] | |||
75 | [email protected] ")" | 74 | [email protected] ")" |
76 | [email protected] " " | 75 | [email protected] " " |
77 | [email protected] | 76 | [email protected] |
78 | [email protected] | 77 | [email protected] "{" |
79 | [email protected] "{" | 78 | [email protected] "}" |
80 | [email protected] "}" | ||
81 | [email protected] "\n\n" | 79 | [email protected] "\n\n" |
82 | [email protected] | 80 | [email protected] |
83 | [email protected] "fn" | 81 | [email protected] "fn" |
@@ -120,7 +118,6 @@ [email protected] | |||
120 | [email protected] ")" | 118 | [email protected] ")" |
121 | [email protected] " " | 119 | [email protected] " " |
122 | [email protected] | 120 | [email protected] |
123 | [email protected] | 121 | [email protected] "{" |
124 | [email protected] "{" | 122 | [email protected] "}" |
125 | [email protected] "}" | ||
126 | [email protected] "\n" | 123 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast index dcdb3cc6d..9e0cec35f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast +++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast | |||
@@ -22,29 +22,28 @@ [email protected] | |||
22 | [email protected] ")" | 22 | [email protected] ")" |
23 | [email protected] " " | 23 | [email protected] " " |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "{" |
26 | [email protected] "{" | 26 | [email protected] "\n " |
27 | [email protected] "\n " | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] "let" |
29 | [email protected] "let" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] "(" |
32 | [email protected] "(" | 32 | [email protected] ")" |
33 | [email protected] ")" | 33 | [email protected] ":" |
34 | [email protected] ":" | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] "::" |
38 | [email protected] "::" | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "X" |
40 | [email protected] "X" | 40 | [email protected] " " |
41 | [email protected] " " | 41 | [email protected] "=" |
42 | [email protected] "=" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] "(" |
45 | [email protected] "(" | 45 | [email protected] ")" |
46 | [email protected] ")" | 46 | [email protected] ";" |
47 | [email protected] ";" | 47 | [email protected] "\n" |
48 | [email protected] "\n" | 48 | [email protected] "}" |
49 | [email protected] "}" | ||
50 | [email protected] "\n" | 49 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast index 6176a9620..7fa3033ac 100644 --- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast +++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast | |||
@@ -9,58 +9,56 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "if" |
16 | [email protected] "if" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "1.0f32" |
23 | [email protected] "1.0f32" | 23 | [email protected] "." |
24 | [email protected] "." | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "floor" |
26 | [email protected] "floor" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "(" |
28 | [email protected] "(" | 28 | [email protected] ")" |
29 | [email protected] ")" | 29 | [email protected] " " |
30 | [email protected] " " | 30 | [email protected] "as" |
31 | [email protected] "as" | 31 | [email protected] " " |
32 | [email protected] " " | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] "i64" |
37 | [email protected] "i64" | 37 | [email protected] " " |
38 | [email protected] " " | 38 | [email protected] "!=" |
39 | [email protected] "!=" | 39 | [email protected] " " |
40 | [email protected] " " | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] "1.0f32" |
44 | [email protected] "1.0f32" | 44 | [email protected] "." |
45 | [email protected] "." | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] "floor" |
47 | [email protected] "floor" | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] "(" |
49 | [email protected] "(" | 49 | [email protected] ")" |
50 | [email protected] ")" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] "as" |
52 | [email protected] "as" | 52 | [email protected] " " |
53 | [email protected] " " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] "i64" |
58 | [email protected] "i64" | 58 | [email protected] " " |
59 | [email protected] " " | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] "{" |
61 | [email protected] | 61 | [email protected] "}" |
62 | [email protected] "{" | 62 | [email protected] "\n" |
63 | [email protected] "}" | 63 | [email protected] "}" |
64 | [email protected] "\n" | ||
65 | [email protected] "}" | ||
66 | [email protected] "\n" | 64 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast index 342fe23f5..d93968016 100644 --- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast +++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast | |||
@@ -20,9 +20,8 @@ [email protected] | |||
20 | [email protected] ")" | 20 | [email protected] ")" |
21 | [email protected] " " | 21 | [email protected] " " |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "{" |
24 | [email protected] "{" | 24 | [email protected] "}" |
25 | [email protected] "}" | ||
26 | [email protected] "\n\n" | 25 | [email protected] "\n\n" |
27 | [email protected] | 26 | [email protected] |
28 | [email protected] "fn" | 27 | [email protected] "fn" |
@@ -34,26 +33,24 @@ [email protected] | |||
34 | [email protected] ")" | 33 | [email protected] ")" |
35 | [email protected] " " | 34 | [email protected] " " |
36 | [email protected] | 35 | [email protected] |
37 | [email protected] | 36 | [email protected] "{" |
38 | [email protected] "{" | 37 | [email protected] "\n " |
39 | [email protected] "\n " | 38 | [email protected] |
40 | [email protected] | 39 | [email protected] |
41 | [email protected] | 40 | [email protected] |
42 | [email protected] | 41 | [email protected] |
43 | [email protected] | 42 | [email protected] |
44 | [email protected] | 43 | [email protected] |
45 | [email protected] | 44 | [email protected] "foo" |
46 | [email protected] "foo" | 45 | [email protected] |
47 | [email protected] | 46 | [email protected] "(" |
48 | [email protected] "(" | 47 | [email protected] |
49 | [email protected] | 48 | [email protected] "loop" |
50 | [email protected] "loop" | 49 | [email protected] " " |
51 | [email protected] " " | 50 | [email protected] |
52 | [email protected] | 51 | [email protected] "{" |
53 | [email protected] | 52 | [email protected] "}" |
54 | [email protected] "{" | 53 | [email protected] ")" |
55 | [email protected] "}" | 54 | [email protected] ";" |
56 | [email protected] ")" | 55 | [email protected] "\n" |
57 | [email protected] ";" | 56 | [email protected] "}" |
58 | [email protected] "\n" | ||
59 | [email protected] "}" | ||
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast index 360b6e044..b5c72ee36 100644 --- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast +++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast | |||
@@ -9,89 +9,88 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "1" |
19 | [email protected] "1" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "+" |
21 | [email protected] "+" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] "*" |
24 | [email protected] "*" | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] "&" |
26 | [email protected] "&" | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "2" |
28 | [email protected] "2" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "+" |
30 | [email protected] "+" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] "3" |
33 | [email protected] "3" | 33 | [email protected] ";" |
34 | [email protected] ";" | 34 | [email protected] "\n " |
35 | [email protected] "\n " | 35 | [email protected] |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] "*" |
39 | [email protected] "*" | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] "&" |
41 | [email protected] "&" | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] "1" |
43 | [email protected] "1" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] "as" |
45 | [email protected] "as" | 45 | [email protected] " " |
46 | [email protected] " " | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "u64" |
51 | [email protected] "u64" | 51 | [email protected] ";" |
52 | [email protected] ";" | 52 | [email protected] "\n " |
53 | [email protected] "\n " | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] "*" |
56 | [email protected] "*" | 56 | [email protected] |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] "x" |
62 | [email protected] "x" | 62 | [email protected] |
63 | [email protected] | 63 | [email protected] "(" |
64 | [email protected] "(" | 64 | [email protected] |
65 | [email protected] | 65 | [email protected] "1" |
66 | [email protected] "1" | 66 | [email protected] ")" |
67 | [email protected] ")" | 67 | [email protected] ";" |
68 | [email protected] ";" | 68 | [email protected] "\n " |
69 | [email protected] "\n " | 69 | [email protected] |
70 | [email protected] | 70 | [email protected] |
71 | [email protected] | 71 | [email protected] "&" |
72 | [email protected] "&" | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] |
74 | [email protected] | 74 | [email protected] |
75 | [email protected] | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] "x" |
78 | [email protected] "x" | 78 | [email protected] "[" |
79 | [email protected] "[" | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "1" |
81 | [email protected] "1" | 81 | [email protected] "]" |
82 | [email protected] "]" | 82 | [email protected] ";" |
83 | [email protected] ";" | 83 | [email protected] "\n " |
84 | [email protected] "\n " | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "-" |
88 | [email protected] "-" | 88 | [email protected] |
89 | [email protected] | 89 | [email protected] "1" |
90 | [email protected] "1" | 90 | [email protected] ".." |
91 | [email protected] ".." | 91 | [email protected] |
92 | [email protected] | 92 | [email protected] "2" |
93 | [email protected] "2" | 93 | [email protected] ";" |
94 | [email protected] ";" | 94 | [email protected] "\n" |
95 | [email protected] "\n" | 95 | [email protected] "}" |
96 | [email protected] "}" | ||
97 | [email protected] "\n" | 96 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast index 225b1d0b6..ddcb139c1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast +++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast | |||
@@ -9,93 +9,89 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] | 20 | [email protected] "Some" |
21 | [email protected] "Some" | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] "(" |
23 | [email protected] "(" | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] "for" |
25 | [email protected] "for" | 25 | [email protected] " " |
26 | [email protected] " " | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] "_" |
28 | [email protected] "_" | 28 | [email protected] " " |
29 | [email protected] " " | 29 | [email protected] "in" |
30 | [email protected] "in" | 30 | [email protected] " " |
31 | [email protected] " " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] "[" |
34 | [email protected] "[" | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "1" |
36 | [email protected] "1" | 36 | [email protected] "]" |
37 | [email protected] "]" | 37 | [email protected] "." |
38 | [email protected] "." | 38 | [email protected] |
39 | [email protected] | 39 | [email protected] "into_iter" |
40 | [email protected] "into_iter" | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "(" |
42 | [email protected] "(" | 42 | [email protected] ")" |
43 | [email protected] ")" | 43 | [email protected] " " |
44 | [email protected] " " | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] "{" |
46 | [email protected] | 46 | [email protected] "}" |
47 | [email protected] "{" | 47 | [email protected] ")" |
48 | [email protected] "}" | 48 | [email protected] ";" |
49 | [email protected] ")" | 49 | [email protected] "\n " |
50 | [email protected] ";" | 50 | [email protected] |
51 | [email protected] "\n " | 51 | [email protected] |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] "Some" |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] "Some" | 58 | [email protected] "(" |
59 | [email protected] | 59 | [email protected] |
60 | [email protected] "(" | 60 | [email protected] "loop" |
61 | [email protected] | 61 | [email protected] " " |
62 | [email protected] "loop" | 62 | [email protected] |
63 | [email protected] " " | 63 | [email protected] "{" |
64 | [email protected] | 64 | [email protected] " " |
65 | [email protected] | 65 | [email protected] |
66 | [email protected] "{" | 66 | [email protected] |
67 | [email protected] " " | 67 | [email protected] "break" |
68 | [email protected] | 68 | [email protected] ";" |
69 | [email protected] | 69 | [email protected] " " |
70 | [email protected] "break" | 70 | [email protected] "}" |
71 | [email protected] ";" | 71 | [email protected] ")" |
72 | [email protected] " " | 72 | [email protected] ";" |
73 | [email protected] "}" | 73 | [email protected] "\n " |
74 | [email protected] ")" | 74 | [email protected] |
75 | [email protected] ";" | 75 | [email protected] |
76 | [email protected] "\n " | 76 | [email protected] |
77 | [email protected] | 77 | [email protected] |
78 | [email protected] | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] "Some" |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "(" |
83 | [email protected] "Some" | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "while" |
85 | [email protected] "(" | 85 | [email protected] " " |
86 | [email protected] | 86 | [email protected] |
87 | [email protected] "while" | 87 | [email protected] |
88 | [email protected] " " | 88 | [email protected] "true" |
89 | [email protected] | 89 | [email protected] " " |
90 | [email protected] | 90 | [email protected] |
91 | [email protected] "true" | 91 | [email protected] "{" |
92 | [email protected] " " | 92 | [email protected] "}" |
93 | [email protected] | 93 | [email protected] ")" |
94 | [email protected] | 94 | [email protected] ";" |
95 | [email protected] "{" | 95 | [email protected] "\n" |
96 | [email protected] "}" | 96 | [email protected] "}" |
97 | [email protected] ")" | ||
98 | [email protected] ";" | ||
99 | [email protected] "\n" | ||
100 | [email protected] "}" | ||
101 | [email protected] "\n" | 97 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast index a52a08ed0..098152fc3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast +++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast | |||
@@ -9,48 +9,47 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] |
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] "0" |
19 | [email protected] "0" | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] "as" |
21 | [email protected] "as" | 21 | [email protected] " " |
22 | [email protected] " " | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] "usize" |
27 | [email protected] "usize" | 27 | [email protected] " " |
28 | [email protected] " " | 28 | [email protected] ".." |
29 | [email protected] ".." | 29 | [email protected] ";" |
30 | [email protected] ";" | 30 | [email protected] "\n " |
31 | [email protected] "\n " | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] | 34 | [email protected] |
35 | [email protected] | 35 | [email protected] "1" |
36 | [email protected] "1" | 36 | [email protected] " " |
37 | [email protected] " " | 37 | [email protected] "+" |
38 | [email protected] "+" | 38 | [email protected] " " |
39 | [email protected] " " | 39 | [email protected] |
40 | [email protected] | 40 | [email protected] |
41 | [email protected] | 41 | [email protected] "2" |
42 | [email protected] "2" | 42 | [email protected] " " |
43 | [email protected] " " | 43 | [email protected] "as" |
44 | [email protected] "as" | 44 | [email protected] " " |
45 | [email protected] " " | 45 | [email protected] |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
48 | [email protected] | 48 | [email protected] |
49 | [email protected] | 49 | [email protected] "usize" |
50 | [email protected] "usize" | 50 | [email protected] " " |
51 | [email protected] " " | 51 | [email protected] ".." |
52 | [email protected] ".." | 52 | [email protected] ";" |
53 | [email protected] ";" | 53 | [email protected] "\n" |
54 | [email protected] "\n" | 54 | [email protected] "}" |
55 | [email protected] "}" | ||
56 | [email protected] "\n" | 55 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast index b8974c942..c6e982976 100644 --- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast +++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast | |||
@@ -9,19 +9,18 @@ [email protected] | |||
9 | [email protected] ")" | 9 | [email protected] ")" |
10 | [email protected] " " | 10 | [email protected] " " |
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] "{" |
13 | [email protected] "{" | 13 | [email protected] "\n " |
14 | [email protected] "\n " | 14 | [email protected] |
15 | [email protected] | 15 | [email protected] "match" |
16 | [email protected] "match" | 16 | [email protected] " " |
17 | [email protected] " " | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] ".." |
19 | [email protected] ".." | 19 | [email protected] " " |
20 | [email protected] " " | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] "{" |
22 | [email protected] "{" | 22 | [email protected] "\n " |
23 | [email protected] "\n " | 23 | [email protected] "}" |
24 | [email protected] "}" | 24 | [email protected] "\n" |
25 | [email protected] "\n" | 25 | [email protected] "}" |
26 | [email protected] "}" | ||
27 | [email protected] "\n" | 26 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast index 46f370eec..bf791ee2b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast +++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast | |||
@@ -70,107 +70,106 @@ [email protected] | |||
70 | [email protected] ")" | 70 | [email protected] ")" |
71 | [email protected] " " | 71 | [email protected] " " |
72 | [email protected] | 72 | [email protected] |
73 | [email protected] | 73 | [email protected] "{" |
74 | [email protected] "{" | 74 | [email protected] "\n " |
75 | [email protected] "\n " | 75 | [email protected] |
76 | [email protected] | 76 | [email protected] "macro" |
77 | [email protected] "macro" | 77 | [email protected] " " |
78 | [email protected] " " | 78 | [email protected] |
79 | [email protected] | 79 | [email protected] "test_merge" |
80 | [email protected] "test_merge" | 80 | [email protected] |
81 | [email protected] | 81 | [email protected] |
82 | [email protected] | 82 | [email protected] "(" |
83 | [email protected] "(" | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] "[" |
85 | [email protected] "[" | 85 | [email protected] "$" |
86 | [email protected] "$" | 86 | [email protected] |
87 | [email protected] | 87 | [email protected] "(" |
88 | [email protected] "(" | 88 | [email protected] "$" |
89 | [email protected] "$" | 89 | [email protected] "input" |
90 | [email protected] "input" | 90 | [email protected] ":" |
91 | [email protected] ":" | 91 | [email protected] "expr" |
92 | [email protected] "expr" | 92 | [email protected] ")" |
93 | [email protected] ")" | 93 | [email protected] "," |
94 | [email protected] "," | 94 | [email protected] "*" |
95 | [email protected] "*" | 95 | [email protected] " " |
96 | [email protected] " " | 96 | [email protected] "$" |
97 | [email protected] "$" | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] "(" |
99 | [email protected] "(" | 99 | [email protected] "," |
100 | [email protected] "," | 100 | [email protected] ")" |
101 | [email protected] ")" | 101 | [email protected] "*" |
102 | [email protected] "*" | 102 | [email protected] "]" |
103 | [email protected] "]" | 103 | [email protected] "," |
104 | [email protected] "," | 104 | [email protected] " " |
105 | [email protected] " " | 105 | [email protected] |
106 | [email protected] | 106 | [email protected] "[" |
107 | [email protected] "[" | 107 | [email protected] "$" |
108 | [email protected] "$" | 108 | [email protected] |
109 | [email protected] | 109 | [email protected] "(" |
110 | [email protected] "(" | 110 | [email protected] "$" |
111 | [email protected] "$" | 111 | [email protected] "output" |
112 | [email protected] "output" | 112 | [email protected] ":" |
113 | [email protected] ":" | 113 | [email protected] "expr" |
114 | [email protected] "expr" | 114 | [email protected] ")" |
115 | [email protected] ")" | 115 | [email protected] "," |
116 | [email protected] "," | 116 | [email protected] "*" |
117 | [email protected] "*" | 117 | [email protected] " " |
118 | [email protected] " " | 118 | [email protected] "$" |
119 | [email protected] "$" | 119 | [email protected] |
120 | [email protected] | 120 | [email protected] "(" |
121 | [email protected] "(" | 121 | [email protected] "," |
122 | [email protected] "," | 122 | [email protected] ")" |
123 | [email protected] ")" | 123 | [email protected] "*" |
124 | [email protected] "*" | 124 | [email protected] "]" |
125 | [email protected] "]" | 125 | [email protected] ")" |
126 | [email protected] ")" | 126 | [email protected] " " |
127 | [email protected] " " | 127 | [email protected] |
128 | [email protected] | 128 | [email protected] "{" |
129 | [email protected] "{" | 129 | [email protected] "\n " |
130 | [email protected] "\n " | 130 | [email protected] "assert_eq" |
131 | [email protected] "assert_eq" | 131 | [email protected] "!" |
132 | [email protected] "!" | 132 | [email protected] |
133 | [email protected] | 133 | [email protected] "(" |
134 | [email protected] "(" | 134 | [email protected] "\n " |
135 | [email protected] "\n " | 135 | [email protected] "merge_use_trees" |
136 | [email protected] "merge_use_trees" | 136 | [email protected] |
137 | [email protected] | 137 | [email protected] "(" |
138 | [email protected] "(" | 138 | [email protected] "parse_use_trees" |
139 | [email protected] "parse_use_trees" | 139 | [email protected] "!" |
140 | [email protected] "!" | 140 | [email protected] |
141 | [email protected] | 141 | [email protected] "(" |
142 | [email protected] "(" | 142 | [email protected] "$" |
143 | [email protected] "$" | 143 | [email protected] |
144 | [email protected] | 144 | [email protected] "(" |
145 | [email protected] "(" | 145 | [email protected] "$" |
146 | [email protected] "$" | 146 | [email protected] "input" |
147 | [email protected] "input" | 147 | [email protected] "," |
148 | [email protected] "," | 148 | [email protected] ")" |
149 | [email protected] ")" | 149 | [email protected] "*" |
150 | [email protected] "*" | 150 | [email protected] ")" |
151 | [email protected] ")" | 151 | [email protected] ")" |
152 | [email protected] ")" | 152 | [email protected] "," |
153 | [email protected] "," | 153 | [email protected] "\n " |
154 | [email protected] "\n " | 154 | [email protected] "parse_use_trees" |
155 | [email protected] "parse_use_trees" | 155 | [email protected] "!" |
156 | [email protected] "!" | 156 | [email protected] |
157 | [email protected] | 157 | [email protected] "(" |
158 | [email protected] "(" | 158 | [email protected] "$" |
159 | [email protected] "$" | 159 | [email protected] |
160 | [email protected] | 160 | [email protected] "(" |
161 | [email protected] "(" | 161 | [email protected] "$" |
162 | [email protected] "$" | 162 | [email protected] "output" |
163 | [email protected] "output" | 163 | [email protected] "," |
164 | [email protected] "," | 164 | [email protected] ")" |
165 | [email protected] ")" | 165 | [email protected] "*" |
166 | [email protected] "*" | 166 | [email protected] ")" |
167 | [email protected] ")" | 167 | [email protected] "," |
168 | [email protected] "," | 168 | [email protected] "\n " |
169 | [email protected] "\n " | 169 | [email protected] ")" |
170 | [email protected] ")" | 170 | [email protected] ";" |
171 | [email protected] ";" | 171 | [email protected] "\n " |
172 | [email protected] "\n " | 172 | [email protected] "}" |
173 | [email protected] "}" | 173 | [email protected] "\n" |
174 | [email protected] "\n" | 174 | [email protected] "}" |
175 | [email protected] "}" | ||
176 | [email protected] "\n" | 175 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index 1cd77aa14..886b211d0 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast | |||
@@ -47,9 +47,8 @@ [email protected] | |||
47 | [email protected] ")" | 47 | [email protected] ")" |
48 | [email protected] " " | 48 | [email protected] " " |
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] "{" |
51 | [email protected] "{" | 51 | [email protected] "}" |
52 | [email protected] "}" | ||
53 | [email protected] "\n " | 52 | [email protected] "\n " |
54 | [email protected] | 53 | [email protected] |
55 | [email protected] "fn" | 54 | [email protected] "fn" |
@@ -90,9 +89,8 @@ [email protected] | |||
90 | [email protected] ")" | 89 | [email protected] ")" |
91 | [email protected] " " | 90 | [email protected] " " |
92 | [email protected] | 91 | [email protected] |
93 | [email protected] | 92 | [email protected] "{" |
94 | [email protected] "{" | 93 | [email protected] "}" |
95 | [email protected] "}" | ||
96 | [email protected] "\n " | 94 | [email protected] "\n " |
97 | [email protected] | 95 | [email protected] |
98 | [email protected] "fn" | 96 | [email protected] "fn" |
@@ -122,9 +120,8 @@ [email protected] | |||
122 | [email protected] ")" | 120 | [email protected] ")" |
123 | [email protected] " " | 121 | [email protected] " " |
124 | [email protected] | 122 | [email protected] |
125 | [email protected] | 123 | [email protected] "{" |
126 | [email protected] "{" | 124 | [email protected] "}" |
127 | [email protected] "}" | ||
128 | [email protected] "\n " | 125 | [email protected] "\n " |
129 | [email protected] | 126 | [email protected] |
130 | [email protected] "fn" | 127 | [email protected] "fn" |
@@ -155,9 +152,8 @@ [email protected] | |||
155 | [email protected] ")" | 152 | [email protected] ")" |
156 | [email protected] " " | 153 | [email protected] " " |
157 | [email protected] | 154 | [email protected] |
158 | [email protected] | 155 | [email protected] "{" |
159 | [email protected] "{" | 156 | [email protected] "}" |
160 | [email protected] "}" | ||
161 | [email protected] "\n " | 157 | [email protected] "\n " |
162 | [email protected] | 158 | [email protected] |
163 | [email protected] "fn" | 159 | [email protected] "fn" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index 4f9a14066..a0423806c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast | |||
@@ -50,9 +50,8 @@ [email protected] | |||
50 | [email protected] ")" | 50 | [email protected] ")" |
51 | [email protected] " " | 51 | [email protected] " " |
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] "{" |
54 | [email protected] "{" | 54 | [email protected] "}" |
55 | [email protected] "}" | ||
56 | [email protected] "\n " | 55 | [email protected] "\n " |
57 | [email protected] | 56 | [email protected] |
58 | [email protected] "fn" | 57 | [email protected] "fn" |
@@ -93,9 +92,8 @@ [email protected] | |||
93 | [email protected] ")" | 92 | [email protected] ")" |
94 | [email protected] " " | 93 | [email protected] " " |
95 | [email protected] | 94 | [email protected] |
96 | [email protected] | 95 | [email protected] "{" |
97 | [email protected] "{" | 96 | [email protected] "}" |
98 | [email protected] "}" | ||
99 | [email protected] "\n " | 97 | [email protected] "\n " |
100 | [email protected] | 98 | [email protected] |
101 | [email protected] "fn" | 99 | [email protected] "fn" |
@@ -125,9 +123,8 @@ [email protected] | |||
125 | [email protected] ")" | 123 | [email protected] ")" |
126 | [email protected] " " | 124 | [email protected] " " |
127 | [email protected] | 125 | [email protected] |
128 | [email protected] | 126 | [email protected] "{" |
129 | [email protected] "{" | 127 | [email protected] "}" |
130 | [email protected] "}" | ||
131 | [email protected] "\n " | 128 | [email protected] "\n " |
132 | [email protected] | 129 | [email protected] |
133 | [email protected] "fn" | 130 | [email protected] "fn" |
@@ -158,9 +155,8 @@ [email protected] | |||
158 | [email protected] ")" | 155 | [email protected] ")" |
159 | [email protected] " " | 156 | [email protected] " " |
160 | [email protected] | 157 | [email protected] |
161 | [email protected] | 158 | [email protected] "{" |
162 | [email protected] "{" | 159 | [email protected] "}" |
163 | [email protected] "}" | ||
164 | [email protected] "\n" | 160 | [email protected] "\n" |
165 | [email protected] "}" | 161 | [email protected] "}" |
166 | [email protected] "\n" | 162 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast index 3294f4901..d1fffdd63 100644 --- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast +++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast | |||
@@ -11,7 +11,6 @@ [email protected] | |||
11 | [email protected] ")" | 11 | [email protected] ")" |
12 | [email protected] " " | 12 | [email protected] " " |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] | 14 | [email protected] "{" |
15 | [email protected] "{" | 15 | [email protected] "}" |
16 | [email protected] "}" | ||
17 | [email protected] "\n" | 16 | [email protected] "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast index 633b14000..eb2f8eb3c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast +++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast | |||
@@ -55,7 +55,6 @@ [email protected] | |||
55 | [email protected] "Send" | 55 | [email protected] "Send" |
56 | [email protected] " " | 56 | [email protected] " " |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] "{" |
59 | [email protected] "{" | 59 | [email protected] "}" |
60 | [email protected] "}" | ||
61 | [email protected] "\n" | 60 | [email protected] "\n" |