rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/hir-expand/src/builtin/derive_macro.rs')

-rw-r--r--

1 files changed, 3 insertions, 3 deletions

diff --git a/crates/hir-expand/src/builtin/derive_macro.rs b/crates/hir-expand/src/builtin/derive_macro.rs
index c805197425..f208203c93 100644
--- a/crates/hir-expand/src/builtin/derive_macro.rs
+++ b/crates/hir-expand/src/builtin/derive_macro.rs

@@ -5,7 +5,7 @@ use intern::sym;

use itertools::{Itertools, izip};

use parser::SyntaxKind;

use rustc_hash::FxHashSet;

-use span::{Edition, Span, SyntaxContext};

+use span::{Edition, Span};

use stdx::never;

use syntax_bridge::DocCommentDesugarMode;

use tracing::debug;

@@ -238,7 +238,7 @@ fn parse_adt(

fn parse_adt_from_syntax(

adt: &ast::Adt,

- tm: &span::SpanMap<SyntaxContext>,

+ tm: &span::SpanMap,

call_site: Span,

) -> Result<BasicAdtInfo, ExpandError> {

let (name, generic_param_list, where_clause, shape) = match &adt {

@@ -390,7 +390,7 @@ fn to_adt_syntax(

db: &dyn ExpandDatabase,

tt: &tt::TopSubtree,

call_site: Span,

-) -> Result<(ast::Adt, span::SpanMap<SyntaxContext>), ExpandError> {

+) -> Result<(ast::Adt, span::SpanMap), ExpandError> {

let (parsed, tm) = crate::db::token_tree_to_syntax_node(db, tt, crate::ExpandTo::Items);

let macro_items = ast::MacroItems::cast(parsed.syntax_node())

.ok_or_else(|| ExpandError::other(call_site, "invalid item definition"))?;