diff options
| author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
| commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
| tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /crates/ra_hir_expand/src | |
| parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
| parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_hir_expand/src')
| -rw-r--r-- | crates/ra_hir_expand/src/builtin_derive.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs index 79aea5806..bb45b0f1d 100644 --- a/crates/ra_hir_expand/src/builtin_derive.rs +++ b/crates/ra_hir_expand/src/builtin_derive.rs | |||
| @@ -73,9 +73,9 @@ fn parse_adt(tt: &tt::Subtree) -> Result<BasicAdtInfo, mbe::ExpandError> { | |||
| 73 | let node = item.syntax(); | 73 | let node = item.syntax(); |
| 74 | let (name, params) = match_ast! { | 74 | let (name, params) = match_ast! { |
| 75 | match node { | 75 | match node { |
| 76 | ast::StructDef(it) => { (it.name(), it.type_param_list()) }, | 76 | ast::StructDef(it) => (it.name(), it.type_param_list()), |
| 77 | ast::EnumDef(it) => { (it.name(), it.type_param_list()) }, | 77 | ast::EnumDef(it) => (it.name(), it.type_param_list()), |
| 78 | ast::UnionDef(it) => { (it.name(), it.type_param_list()) }, | 78 | ast::UnionDef(it) => (it.name(), it.type_param_list()), |
| 79 | _ => { | 79 | _ => { |
| 80 | debug!("unexpected node is {:?}", node); | 80 | debug!("unexpected node is {:?}", node); |
| 81 | return Err(mbe::ExpandError::ConversionError) | 81 | return Err(mbe::ExpandError::ConversionError) |