diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-19 13:23:56 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-19 13:23:56 +0000 |
commit | c0897957133dde949d9c852c49766b7d116ff6ba (patch) | |
tree | 960d42c02317050c6415b13fc74ad3c1f55f1c20 /crates/hir_def/src/nameres.rs | |
parent | a627377949d308603bb0bd7ef627ffe8186e1788 (diff) | |
parent | 54c78c96dbe61c2f1b6ec9f83a35a8ad6f6ae4fe (diff) |
Merge #8104
8104: Rename derive-specific APIs r=jonas-schievink a=jonas-schievink
Indicate that they're derive-specific
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src/nameres.rs')
-rw-r--r-- | crates/hir_def/src/nameres.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs index 1ac326f97..0d3a0b54f 100644 --- a/crates/hir_def/src/nameres.rs +++ b/crates/hir_def/src/nameres.rs | |||
@@ -575,7 +575,7 @@ mod diagnostics { | |||
575 | let node = ast.to_node(db.upcast()); | 575 | let node = ast.to_node(db.upcast()); |
576 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node)), None) | 576 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node)), None) |
577 | } | 577 | } |
578 | MacroCallKind::Attr(ast, name) => { | 578 | MacroCallKind::Derive(ast, name) => { |
579 | let node = ast.to_node(db.upcast()); | 579 | let node = ast.to_node(db.upcast()); |
580 | 580 | ||
581 | // Compute the precise location of the macro name's token in the derive | 581 | // Compute the precise location of the macro name's token in the derive |
@@ -631,7 +631,7 @@ mod diagnostics { | |||
631 | let node = ast.to_node(db.upcast()); | 631 | let node = ast.to_node(db.upcast()); |
632 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node))) | 632 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node))) |
633 | } | 633 | } |
634 | MacroCallKind::Attr(ast, _) => { | 634 | MacroCallKind::Derive(ast, _) => { |
635 | let node = ast.to_node(db.upcast()); | 635 | let node = ast.to_node(db.upcast()); |
636 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node))) | 636 | (ast.file_id, SyntaxNodePtr::from(AstPtr::new(&node))) |
637 | } | 637 | } |