From 02ec177aac1d8209d1d94f44f5e9d77581dbe7ed Mon Sep 17 00:00:00 2001 From: Ada Alakbarova Date: Fri, 12 Jun 2026 22:22:48 +0200 Subject: [PATCH] internal: remove `no_lifetime` where it's trivial Removing these doesn't seem to cause any compilation errors --- crates/hir-expand/src/db.rs | 2 +- crates/hir-ty/src/db.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs index 513115684f87..9320b707527e 100644 --- a/crates/hir-expand/src/db.rs +++ b/crates/hir-expand/src/db.rs @@ -141,7 +141,7 @@ pub trait ExpandDatabase: SourceDatabase { fn syntax_context(&self, file: HirFileId, edition: Edition) -> SyntaxContext; } -#[salsa_macros::interned(no_lifetime, id = span::SyntaxContext, revisions = usize::MAX)] +#[salsa_macros::interned(id = span::SyntaxContext, revisions = usize::MAX)] pub struct SyntaxContextWrapper { pub data: SyntaxContext, } diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs index baf8bbd56fb1..6bbbd5587e19 100644 --- a/crates/hir-ty/src/db.rs +++ b/crates/hir-ty/src/db.rs @@ -294,14 +294,14 @@ fn hir_database_is_dyn_compatible() { fn _assert_dyn_compatible(_: &dyn HirDatabase) {} } -#[salsa_macros::interned(no_lifetime, debug, revisions = usize::MAX)] +#[salsa_macros::interned(debug, revisions = usize::MAX)] #[derive(PartialOrd, Ord)] pub struct InternedLifetimeParamId { /// This stores the param and its index. pub loc: (LifetimeParamId, u32), } -#[salsa_macros::interned(no_lifetime, debug, revisions = usize::MAX)] +#[salsa_macros::interned(debug, revisions = usize::MAX)] #[derive(PartialOrd, Ord)] pub struct InternedConstParamId { pub loc: ConstParamId,