language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't intern attribute inputs as their spans make them unique

Browse source
This commit is contained in:
Lukas Wirth 2024-06-09 21:21:33 +02:00
parent 913371fb0b
commit 2328085a79
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-expand/src/attrs.rs
View file

@ -54,7 +54,7 @@ impl RawAttrs {
let span = span_map.span_for_range(comment.syntax().text_range()); let span = span_map.span_for_range(comment.syntax().text_range());
Attr { Attr {
id, id,
input: Some(Interned::new(AttrInput::Literal(tt::Literal { input: Some(Box::new(AttrInput::Literal(tt::Literal {
text: SmolStr::new(format_smolstr!("\"{}\"", Self::escape_chars(doc))), text: SmolStr::new(format_smolstr!("\"{}\"", Self::escape_chars(doc))),
span, span,
}))), }))),
@ -199,7 +199,7 @@ impl AttrId {
pub struct Attr { pub struct Attr {
pub id: AttrId, pub id: AttrId,
pub path: Interned<ModPath>, pub path: Interned<ModPath>,
pub input: Option<Interned<AttrInput>>, pub input: Option<Box<AttrInput>>,
pub ctxt: SyntaxContextId, pub ctxt: SyntaxContextId,
} }
@ -234,7 +234,7 @@ impl Attr {
})?); })?);
let span = span_map.span_for_range(range); let span = span_map.span_for_range(range);
let input = if let Some(ast::Expr::Literal(lit)) = ast.expr() { let input = if let Some(ast::Expr::Literal(lit)) = ast.expr() {
Some(Interned::new(AttrInput::Literal(tt::Literal { Some(Box::new(AttrInput::Literal(tt::Literal {
text: lit.token().text().into(), text: lit.token().text().into(),
span, span,
}))) })))
@ -245,7 +245,7 @@ impl Attr {
span, span,
DocCommentDesugarMode::ProcMacro, DocCommentDesugarMode::ProcMacro,
); );
Some(Interned::new(AttrInput::TokenTree(Box::new(tree)))) Some(Box::new(AttrInput::TokenTree(Box::new(tree))))
} else { } else {
None None
}; };
@ -281,12 +281,12 @@ impl Attr {
let input = match input.first() { let input = match input.first() {
Some(tt::TokenTree::Subtree(tree)) => { Some(tt::TokenTree::Subtree(tree)) => {
Some(Interned::new(AttrInput::TokenTree(Box::new(tree.clone())))) Some(Box::new(AttrInput::TokenTree(Box::new(tree.clone()))))
} }
Some(tt::TokenTree::Leaf(tt::Leaf::Punct(tt::Punct { char: '=', .. }))) => { Some(tt::TokenTree::Leaf(tt::Leaf::Punct(tt::Punct { char: '=', .. }))) => {
let input = match input.get(1) { let input = match input.get(1) {
Some(tt::TokenTree::Leaf(tt::Leaf::Literal(lit))) => { Some(tt::TokenTree::Leaf(tt::Leaf::Literal(lit))) => {
Some(Interned::new(AttrInput::Literal(lit.clone()))) Some(Box::new(AttrInput::Literal(lit.clone())))
} }
_ => None, _ => None,
}; };