rust-analyzer

diff --git a/crates/ide-completion/src/render.rs b/crates/ide-completion/src/render.rs
index 5a34782235..a636c0603b 100644
--- a/crates/ide-completion/src/render.rs
+++ b/crates/ide-completion/src/render.rs

@@ -92,26 +92,32 @@ impl<'a> RenderContext<'a> {

&& self.completion.token.parent().is_some_and(|it| it.kind() == SyntaxKind::MACRO_CALL)

}

- fn is_deprecated(&self, def: impl HasAttrs) -> bool {

- def.attrs(self.db()).is_deprecated()

- }

- fn is_deprecated_assoc_item(&self, as_assoc_item: impl AsAssocItem) -> bool {

+ /// Whether `def` is deprecated.

+ ///

+ /// This can happen for two reasons:

+ /// - the def is marked with `#[deprecated]`

+ /// - the def is an assoc item whose trait is deprecated

+ ///

+ /// In order to be able to check for the latter, we'd ideally want to `try_as_dyn<_, dyn AsAssocItem>(def)`

+ /// (see [`try_as_dyn`][]), but that function is currently unstable. Therefore, we employ a hack instead:

+ /// if `def` can be an assoc item, it should be passed to this method as follows:

+ /// ```ignore

+ /// self.is_deprecated(def, Some(def))

+ /// ```

+ /// otherwise, it should be passed as:

+ /// ```ignore

+ /// self.is_deprecated(def, None)

+ /// ```

+ ///

+ /// [`try_as_dyn`]: https://doc.rust-lang.org/std/any/fn.try_as_dyn.html

+ fn is_deprecated(&self, def: impl HasAttrs, def_as_assoc_item: Option<hir::AssocItem>) -> bool {

let db = self.db();

- let assoc = match as_assoc_item.as_assoc_item(db) {

- Some(assoc) => assoc,

- None => return false,

- };

- let is_assoc_deprecated = match assoc {

- hir::AssocItem::Function(it) => self.is_deprecated(it),

- hir::AssocItem::Const(it) => self.is_deprecated(it),

- hir::AssocItem::TypeAlias(it) => self.is_deprecated(it),

- };

- is_assoc_deprecated

- || assoc

- .container_or_implemented_trait(db)

- .is_some_and(|trait_| self.is_deprecated(trait_))

+ def.attrs(db).is_deprecated()

+ || def_as_assoc_item

+ .and_then(|assoc| assoc.container_or_implemented_trait(db))

+ .is_some_and(|trait_| {

+ self.is_deprecated(trait_, None /* traits can't be assoc items */)

+ })

}

// FIXME: remove this

@@ -128,7 +134,7 @@ pub(crate) fn render_field(

ty: &hir::Type<'_>,

) -> CompletionItem {

let db = ctx.db();

- let is_deprecated = ctx.is_deprecated(field);

+ let is_deprecated = ctx.is_deprecated(field, None /* fields can't be assoc items */);

let name = field.name(db);

let (name, escaped_name) =

(name.as_str().to_smolstr(), name.display_no_db(ctx.completion.edition).to_smolstr());

@@ -575,10 +581,15 @@ fn scope_def_docs(db: &RootDatabase, resolution: ScopeDef) -> Option<Documentati

}

fn scope_def_is_deprecated(ctx: &RenderContext<'_>, resolution: ScopeDef) -> bool {

+ let db = ctx.db();

match resolution {

- ScopeDef::ModuleDef(it) => ctx.is_deprecated(it) || ctx.is_deprecated_assoc_item(it),

- ScopeDef::GenericParam(it) => ctx.is_deprecated(it),

- ScopeDef::AdtSelfType(it) => ctx.is_deprecated(it),

+ ScopeDef::ModuleDef(it) => ctx.is_deprecated(it, it.as_assoc_item(db)),

+ ScopeDef::GenericParam(it) => {

+ ctx.is_deprecated(it, None /* generic params can't be assoc items */)

+ }

+ ScopeDef::AdtSelfType(it) => {

+ ctx.is_deprecated(it, None /* `Self` can't be an assoc item */)

+ }

_ => false,

}

diff --git a/crates/ide-completion/src/render/const_.rs b/crates/ide-completion/src/render/const_.rs
index 707a8aed4f..134a77a899 100644
--- a/crates/ide-completion/src/render/const_.rs
+++ b/crates/ide-completion/src/render/const_.rs

@@ -21,7 +21,7 @@ fn render(ctx: RenderContext<'_>, const_: hir::Const) -> Option<CompletionItem>

let mut item =

CompletionItem::new(SymbolKind::Const, ctx.source_range(), name, ctx.completion.edition);

item.set_documentation(ctx.docs(const_))

- .set_deprecated(ctx.is_deprecated(const_) || ctx.is_deprecated_assoc_item(const_))

+ .set_deprecated(ctx.is_deprecated(const_, const_.as_assoc_item(db)))

.detail(detail)

.set_relevance(ctx.completion_relevance());

diff --git a/crates/ide-completion/src/render/function.rs b/crates/ide-completion/src/render/function.rs
index dfa30841e7..18151cffcd 100644
--- a/crates/ide-completion/src/render/function.rs
+++ b/crates/ide-completion/src/render/function.rs

@@ -147,7 +147,7 @@ fn render(

detail(ctx.completion, func)

};

item.set_documentation(ctx.docs(func))

- .set_deprecated(ctx.is_deprecated(func) || ctx.is_deprecated_assoc_item(func))

+ .set_deprecated(ctx.is_deprecated(func, func.as_assoc_item(db)))

.detail(detail)

.lookup_by(name.as_str().to_smolstr());

diff --git a/crates/ide-completion/src/render/literal.rs b/crates/ide-completion/src/render/literal.rs
index 6e49af980a..b7de3da468 100644
--- a/crates/ide-completion/src/render/literal.rs
+++ b/crates/ide-completion/src/render/literal.rs

@@ -189,8 +189,12 @@ impl Variant {

fn is_deprecated(self, ctx: &RenderContext<'_>) -> bool {

match self {

- Variant::Struct(it) => ctx.is_deprecated(it),

- Variant::EnumVariant(it) => ctx.is_deprecated(it),

+ Variant::Struct(it) => {

+ ctx.is_deprecated(it, None /* structs can't be assoc items */)

+ }

+ Variant::EnumVariant(it) => {

+ ctx.is_deprecated(it, None /* enum variants can't be assoc items */)

+ }

}

diff --git a/crates/ide-completion/src/render/macro_.rs b/crates/ide-completion/src/render/macro_.rs
index 8cdeb8abbf..ff4cf9a75b 100644
--- a/crates/ide-completion/src/render/macro_.rs
+++ b/crates/ide-completion/src/render/macro_.rs

@@ -64,7 +64,7 @@ fn render(

label(&ctx, needs_bang, bra, ket, &name.to_smolstr()),

completion.edition,

);

- item.set_deprecated(ctx.is_deprecated(macro_))

+ item.set_deprecated(ctx.is_deprecated(macro_, None /* macros can't be assoc items */))

.detail(macro_.display(completion.db, completion.display_target).to_string())

.set_documentation(docs)

.set_relevance(ctx.completion_relevance());

diff --git a/crates/ide-completion/src/render/pattern.rs b/crates/ide-completion/src/render/pattern.rs
index fb35d7b9b6..022e97e4f7 100644
--- a/crates/ide-completion/src/render/pattern.rs
+++ b/crates/ide-completion/src/render/pattern.rs

@@ -126,7 +126,9 @@ fn build_completion(

ctx.completion.edition,

);

item.set_documentation(ctx.docs(def))

- .set_deprecated(ctx.is_deprecated(def))

+ .set_deprecated(

+ ctx.is_deprecated(def, None /* the two current `def` arguments to this function, `Struct` and `EnumVariant`, both can't be assoc items */),

+ )

.detail(&pat)

.lookup_by(lookup)

.set_relevance(relevance);

diff --git a/crates/ide-completion/src/render/type_alias.rs b/crates/ide-completion/src/render/type_alias.rs
index 3fc0f369e5..2b79ca2deb 100644
--- a/crates/ide-completion/src/render/type_alias.rs
+++ b/crates/ide-completion/src/render/type_alias.rs

@@ -47,7 +47,7 @@ fn render(

ctx.completion.edition,

);

item.set_documentation(ctx.docs(type_alias))

- .set_deprecated(ctx.is_deprecated(type_alias) || ctx.is_deprecated_assoc_item(type_alias))

+ .set_deprecated(ctx.is_deprecated(type_alias, type_alias.as_assoc_item(db)))

.detail(detail)

.set_relevance(ctx.completion_relevance());

diff --git a/crates/ide-completion/src/render/union_literal.rs b/crates/ide-completion/src/render/union_literal.rs
index 23f0d4e06f..7164c94fde 100644
--- a/crates/ide-completion/src/render/union_literal.rs
+++ b/crates/ide-completion/src/render/union_literal.rs

@@ -95,7 +95,7 @@ pub(crate) fn render_union_literal(

);

item.set_documentation(ctx.docs(un))

- .set_deprecated(ctx.is_deprecated(un))

+ .set_deprecated(ctx.is_deprecated(un, None /* unions can't be assoc items */))

.detail(detail)

.set_relevance(ctx.completion_relevance());