diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 21:05:10 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 21:05:10 +0100 |
commit | 2346a28c638dc8fe945059b68126d268dd7fb690 (patch) | |
tree | 4cfe573d8d6c49c3f92f4a56e5fae3af2b37c1a0 /crates/ra_syntax | |
parent | 1914d0aa7b5518c743e7403da6d7eea3fe28e955 (diff) | |
parent | 8cf19847ddbcbbe1c1bb634dfc4a61ab75ec941d (diff) |
Merge #5634
5634: Finish rename r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r-- | crates/ra_syntax/src/ast/generated/nodes.rs | 8 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/node_ext.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 6cb637b1d..5f51c7536 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs | |||
@@ -893,7 +893,7 @@ pub struct TupleExpr { | |||
893 | impl ast::AttrsOwner for TupleExpr {} | 893 | impl ast::AttrsOwner for TupleExpr {} |
894 | impl TupleExpr { | 894 | impl TupleExpr { |
895 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } | 895 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } |
896 | pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) } | 896 | pub fn fields(&self) -> AstChildren<Expr> { support::children(&self.syntax) } |
897 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 897 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
898 | } | 898 | } |
899 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 899 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
@@ -1210,7 +1210,7 @@ pub struct SlicePat { | |||
1210 | } | 1210 | } |
1211 | impl SlicePat { | 1211 | impl SlicePat { |
1212 | pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) } | 1212 | pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) } |
1213 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1213 | pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
1214 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } | 1214 | pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) } |
1215 | } | 1215 | } |
1216 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1216 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
@@ -1219,7 +1219,7 @@ pub struct TuplePat { | |||
1219 | } | 1219 | } |
1220 | impl TuplePat { | 1220 | impl TuplePat { |
1221 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } | 1221 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } |
1222 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1222 | pub fn fields(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
1223 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 1223 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
1224 | } | 1224 | } |
1225 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1225 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
@@ -1229,7 +1229,7 @@ pub struct TupleStructPat { | |||
1229 | impl TupleStructPat { | 1229 | impl TupleStructPat { |
1230 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 1230 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
1231 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } | 1231 | pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) } |
1232 | pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) } | 1232 | pub fn fields(&self) -> AstChildren<Pat> { support::children(&self.syntax) } |
1233 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } | 1233 | pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) } |
1234 | } | 1234 | } |
1235 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1235 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/ra_syntax/src/ast/node_ext.rs index 2ffb83819..733e97877 100644 --- a/crates/ra_syntax/src/ast/node_ext.rs +++ b/crates/ra_syntax/src/ast/node_ext.rs | |||
@@ -290,7 +290,7 @@ pub struct SlicePatComponents { | |||
290 | 290 | ||
291 | impl ast::SlicePat { | 291 | impl ast::SlicePat { |
292 | pub fn components(&self) -> SlicePatComponents { | 292 | pub fn components(&self) -> SlicePatComponents { |
293 | let mut args = self.args().peekable(); | 293 | let mut args = self.pats().peekable(); |
294 | let prefix = args | 294 | let prefix = args |
295 | .peeking_take_while(|p| match p { | 295 | .peeking_take_while(|p| match p { |
296 | ast::Pat::RestPat(_) => false, | 296 | ast::Pat::RestPat(_) => false, |