diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 11:18:53 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 11:18:53 +0100 |
commit | 683d0a4d93c29c988c40c001a4b574d8f0dcb9c6 (patch) | |
tree | 1d5bb4ce799c6377b49ae73436d50a087db53392 /crates/ra_ssr/src/parsing.rs | |
parent | 6b7cb8b5ab539fc4333ce34bc29bf77c976f232a (diff) | |
parent | 08ea2271e8050165d0aaf4c994ed3dd746aff3ba (diff) |
Merge #5618
5618: Rename TypeRef -> Type r=matklad a=matklad
The TypeRef name comes from IntelliJ days, where you often have both
type *syntax* as well as *semantical* representation of types in
scope. And naming both Type is confusing.
In rust-analyzer however, we use ast types as `ast::Type`, and have
many more semantic counterparts to ast types, so avoiding name clash
here is just confusing.
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ssr/src/parsing.rs')
-rw-r--r-- | crates/ra_ssr/src/parsing.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ssr/src/parsing.rs b/crates/ra_ssr/src/parsing.rs index 78e03f394..4e046910c 100644 --- a/crates/ra_ssr/src/parsing.rs +++ b/crates/ra_ssr/src/parsing.rs | |||
@@ -70,7 +70,7 @@ impl ParsedRule { | |||
70 | rules: Vec::new(), | 70 | rules: Vec::new(), |
71 | }; | 71 | }; |
72 | builder.try_add(ast::Expr::parse(&raw_pattern), raw_template.map(ast::Expr::parse)); | 72 | builder.try_add(ast::Expr::parse(&raw_pattern), raw_template.map(ast::Expr::parse)); |
73 | builder.try_add(ast::TypeRef::parse(&raw_pattern), raw_template.map(ast::TypeRef::parse)); | 73 | builder.try_add(ast::Type::parse(&raw_pattern), raw_template.map(ast::Type::parse)); |
74 | builder.try_add(ast::Item::parse(&raw_pattern), raw_template.map(ast::Item::parse)); | 74 | builder.try_add(ast::Item::parse(&raw_pattern), raw_template.map(ast::Item::parse)); |
75 | builder.try_add(ast::Path::parse(&raw_pattern), raw_template.map(ast::Path::parse)); | 75 | builder.try_add(ast::Path::parse(&raw_pattern), raw_template.map(ast::Path::parse)); |
76 | builder.try_add(ast::Pat::parse(&raw_pattern), raw_template.map(ast::Pat::parse)); | 76 | builder.try_add(ast::Pat::parse(&raw_pattern), raw_template.map(ast::Pat::parse)); |