rust-analyzer

diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs
index 38f9c5a5a1..1e32ee6980 100644
--- a/crates/base-db/src/input.rs
+++ b/crates/base-db/src/input.rs

@@ -447,7 +447,7 @@ impl BuiltDependency {

pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>;

-#[salsa_macros::input]

+#[salsa::input]

#[derive(Debug, PartialOrd, Ord)]

pub struct Crate {

#[returns(ref)]

diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs
index 7f915827b5..4beeae9508 100644
--- a/crates/base-db/src/lib.rs
+++ b/crates/base-db/src/lib.rs

@@ -79,7 +79,7 @@ pub type FxIndexMap<K, V> =

#[macro_export]

macro_rules! impl_intern_key {

($id:ident, $loc:ident) => {

- #[salsa_macros::interned(no_lifetime, revisions = usize::MAX)]

+ #[salsa::interned(no_lifetime, revisions = usize::MAX)]

#[derive(PartialOrd, Ord)]

pub struct $id {

#[returns(ref)]

@@ -246,24 +246,24 @@ pub struct LocalRoots {

pub roots: FxHashSet<SourceRootId>,

}

-#[salsa_macros::input(debug)]

+#[salsa::input(debug)]

pub struct FileText {

#[returns(ref)]

pub text: Arc<str>,

pub file_id: vfs::FileId,

}

-#[salsa_macros::input(debug)]

+#[salsa::input(debug)]

pub struct FileSourceRootInput {

pub source_root_id: SourceRootId,

}

-#[salsa_macros::input(debug)]

+#[salsa::input(debug)]

pub struct SourceRootInput {

pub source_root: Arc<SourceRoot>,

}

-#[salsa_macros::db]

+#[salsa::db]

pub trait SourceDatabase: salsa::Database + std::fmt::Debug {

/// Text of the file.

fn file_text(&self, file_id: vfs::FileId) -> FileText;

diff --git a/crates/hir-def/src/item_tree.rs b/crates/hir-def/src/item_tree.rs
index cb6941aaa4..423ffd5d40 100644
--- a/crates/hir-def/src/item_tree.rs
+++ b/crates/hir-def/src/item_tree.rs

@@ -138,7 +138,7 @@ pub fn file_item_tree(db: &dyn SourceDatabase, file_id: HirFileId, krate: Crate)

}

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

fn file_item_tree_query(

db: &dyn SourceDatabase,

file_id: HirFileId,

@@ -197,7 +197,7 @@ fn file_item_tree_query(

}

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub(crate) fn block_item_tree_query(

db: &dyn SourceDatabase,

block: BlockId,

diff --git a/crates/hir-def/src/lang_item.rs b/crates/hir-def/src/lang_item.rs
index 14e559200f..534a9c31cd 100644
--- a/crates/hir-def/src/lang_item.rs
+++ b/crates/hir-def/src/lang_item.rs

@@ -34,7 +34,7 @@ impl_from!(

);

/// Salsa query. This will look for lang items in a specific crate.

-#[salsa_macros::tracked(returns(as_deref))]

+#[salsa::tracked(returns(as_deref))]

pub fn crate_lang_items(db: &dyn SourceDatabase, krate: Crate) -> Option<Box<LangItems>> {

let _p = tracing::info_span!("crate_lang_items_query").entered();

@@ -112,7 +112,7 @@ pub fn crate_lang_items(db: &dyn SourceDatabase, krate: Crate) -> Option<Box<Lan

/// Salsa query. Look for a lang items, starting from the specified crate and recursively

/// traversing its dependencies.

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub fn lang_items(db: &dyn SourceDatabase, start_crate: Crate) -> LangItems {

let _p = tracing::info_span!("lang_items_query").entered();

diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index c1519a3b0d..bed38d38e0 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs

@@ -492,7 +492,7 @@ mod tracked_struct_token {

}

-#[salsa_macros::tracked(constructor = new_)]

+#[salsa::tracked(constructor = new_)]

#[derive(PartialOrd, Ord)]

pub struct BlockIdLt<'db> {

pub ast_id: AstId<ast::BlockExpr>,

@@ -534,7 +534,7 @@ impl BlockId {

}

-#[salsa_macros::tracked(debug)]

+#[salsa::tracked(debug)]

#[derive(PartialOrd, Ord)]

pub struct ModuleIdLt<'db> {

/// The crate this module belongs to.

@@ -718,7 +718,7 @@ pub struct HrtbLifetimeParamId {

pub local_id: usize,

}

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum ItemContainerId {

ExternBlockId(ExternBlockId),

ModuleId(ModuleId),

@@ -728,7 +728,7 @@ pub enum ItemContainerId {

impl_from!(ModuleId for ItemContainerId);

/// A Data Type

-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum AdtId {

StructId(StructId),

UnionId(UnionId),

@@ -737,7 +737,7 @@ pub enum AdtId {

impl_from!(StructId, UnionId, EnumId for AdtId);

/// A macro

-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum MacroId {

Macro2Id(Macro2Id),

MacroRulesId(MacroRulesId),

@@ -859,7 +859,7 @@ impl From<DefWithBodyId> for ModuleDefId {

}

/// The defs which have a body.

-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum DefWithBodyId {

/// A function body.

FunctionId(FunctionId),

@@ -889,7 +889,7 @@ impl DefWithBodyId {

}

-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum AssocItemId {

FunctionId(FunctionId),

ConstId(ConstId),

@@ -911,7 +911,7 @@ impl_from!(

for ModuleDefId

);

-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum GenericDefId {

AdtId(AdtId),

// consts can have type parameters from their parents (i.e. associated consts of traits)

@@ -1058,7 +1058,7 @@ impl_from!(

for GenericDefId

);

-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum CallableDefId {

FunctionId(FunctionId),

StructId(StructId),

@@ -1085,7 +1085,7 @@ impl CallableDefId {

}

-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum AttrDefId {

ModuleId(ModuleId),

AdtId(AdtId),

@@ -1124,7 +1124,7 @@ impl_from!(

);

#[derive(

- Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, salsa_macros::Supertype, salsa::Update,

+ Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, salsa::Supertype, salsa::Update,

)]

pub enum VariantId {

EnumVariantId(EnumVariantId),

diff --git a/crates/hir-def/src/nameres.rs b/crates/hir-def/src/nameres.rs
index 4b7856e0c1..c1daad5b3f 100644
--- a/crates/hir-def/src/nameres.rs
+++ b/crates/hir-def/src/nameres.rs

@@ -381,7 +381,7 @@ pub fn crate_def_map(db: &dyn SourceDatabase, crate_id: Crate) -> &DefMap {

crate_local_def_map(db, crate_id).def_map(db)

}

-#[salsa_macros::tracked]

+#[salsa::tracked]

pub(crate) struct DefMapPair<'db> {

#[tracked]

#[returns(ref)]

@@ -390,7 +390,7 @@ pub(crate) struct DefMapPair<'db> {

pub(crate) local: LocalDefMap,

}

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub(crate) fn crate_local_def_map(db: &dyn SourceDatabase, crate_id: Crate) -> DefMapPair<'_> {

let krate = crate_id.data(db);

let _p = tracing::info_span!(

@@ -424,7 +424,7 @@ pub(crate) fn crate_local_def_map(db: &dyn SourceDatabase, crate_id: Crate) -> D

DefMapPair::new(db, def_map, local_def_map)

}

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub fn block_def_map<'db>(db: &'db dyn SourceDatabase, block_id: BlockIdLt<'db>) -> DefMap {

let block_id = unsafe { block_id.to_static() };

let ast_id = block_id.ast_id(db);

diff --git a/crates/hir-def/src/test_db.rs b/crates/hir-def/src/test_db.rs
index 0598ab4a04..4433522c18 100644
--- a/crates/hir-def/src/test_db.rs
+++ b/crates/hir-def/src/test_db.rs

@@ -20,7 +20,7 @@ use crate::{

src::HasSource,

};

-#[salsa_macros::db]

+#[salsa::db]

pub(crate) struct TestDB {

storage: salsa::Storage<Self>,

files: Arc<base_db::Files>,

@@ -73,7 +73,7 @@ impl Clone for TestDB {

}

-#[salsa_macros::db]

+#[salsa::db]

impl salsa::Database for TestDB {}

impl fmt::Debug for TestDB {

@@ -84,7 +84,7 @@ impl fmt::Debug for TestDB {

impl panic::RefUnwindSafe for TestDB {}

-#[salsa_macros::db]

+#[salsa::db]

impl SourceDatabase for TestDB {

fn file_text(&self, file_id: base_db::FileId) -> FileText {

self.files.file_text(file_id)

diff --git a/crates/hir-expand/src/lib.rs b/crates/hir-expand/src/lib.rs
index 511b94d741..58ab0e537f 100644
--- a/crates/hir-expand/src/lib.rs
+++ b/crates/hir-expand/src/lib.rs

@@ -1544,7 +1544,7 @@ impl ExpandTo {

///

/// We encode macro definitions into ids of macro calls, this what allows us

/// to be incremental.

-#[salsa_macros::interned(no_lifetime, debug, revisions = usize::MAX)]

+#[salsa::interned(no_lifetime, debug, revisions = usize::MAX)]

#[doc(alias = "MacroFileId")]

pub struct MacroCallId {

#[returns(ref)]

@@ -1565,7 +1565,7 @@ impl From<MacroCallId> for span::MacroCallId {

}

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum HirFileId {

FileId(EditionedFileId),

MacroFile(MacroCallId),

diff --git a/crates/hir-expand/src/span_map.rs b/crates/hir-expand/src/span_map.rs
index 7b1a04de73..192a3c06e5 100644
--- a/crates/hir-expand/src/span_map.rs
+++ b/crates/hir-expand/src/span_map.rs

@@ -50,7 +50,7 @@ impl HirFileId {

/// This is an implementation detail of [`HirFileId::span_map`]. Outside this crate, use

/// `HirFileId::from(file_id).span_map(db)` instead of `real_span_map(db, file_id)`.

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub(crate) fn real_span_map(

db: &dyn SourceDatabase,

editioned_file_id: base_db::EditionedFileId,

diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs
index 2954af0b52..8e7e55a77b 100644
--- a/crates/hir-ty/src/db.rs
+++ b/crates/hir-ty/src/db.rs

@@ -346,7 +346,7 @@ fn hir_database_is_dyn_compatible() {

fn _assert_dyn_compatible(_: &dyn HirDatabase) {}

}

-#[salsa_macros::interned(debug, revisions = usize::MAX)]

+#[salsa::interned(debug, revisions = usize::MAX)]

#[derive(PartialOrd, Ord)]

pub struct InternedOpaqueTyId {

pub loc: ImplTraitId,

@@ -359,7 +359,7 @@ pub struct InternedClosure<'db> {

pub kind: ClosureKind,

}

-#[salsa_macros::interned(constructor = new_impl, debug, revisions = usize::MAX)]

+#[salsa::interned(constructor = new_impl, debug, revisions = usize::MAX)]

#[derive(PartialOrd, Ord)]

pub struct InternedClosureId<'db> {

pub loc: InternedClosure<'db>,

@@ -387,7 +387,7 @@ impl<'db> InternedClosureId<'db> {

}

-#[salsa_macros::interned(constructor = new_impl, debug, revisions = usize::MAX)]

+#[salsa::interned(constructor = new_impl, debug, revisions = usize::MAX)]

#[derive(PartialOrd, Ord)]

pub struct InternedCoroutineId<'db> {

pub loc: InternedClosure<'db>,

@@ -416,7 +416,7 @@ impl<'db> InternedCoroutineId<'db> {

}

-#[salsa_macros::interned(constructor = new_impl, debug, revisions = usize::MAX)]

+#[salsa::interned(constructor = new_impl, debug, revisions = usize::MAX)]

#[derive(PartialOrd, Ord)]

pub struct InternedCoroutineClosureId<'db> {

pub loc: InternedClosure<'db>,

@@ -460,7 +460,7 @@ pub struct AnonConstLoc {

pub(crate) allow_using_generic_params: bool,

}

-#[salsa_macros::interned(debug, revisions = usize::MAX, constructor = new_)]

+#[salsa::interned(debug, revisions = usize::MAX, constructor = new_)]

#[derive(PartialOrd, Ord)]

pub struct AnonConstId {

#[returns(ref)]

@@ -530,7 +530,7 @@ impl<'db> AnonConstId<'db> {

/// A constant, which might appears as a const item, an anonymous const block in expressions

/// or patterns, or as a constant in types with const generics.

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum GeneralConstId<'db> {

ConstId(ConstId),

StaticId(StaticId),

diff --git a/crates/hir-ty/src/layout/target.rs b/crates/hir-ty/src/layout/target.rs
index cf92c18f8c..4ff5eb7690 100644
--- a/crates/hir-ty/src/layout/target.rs
+++ b/crates/hir-ty/src/layout/target.rs

@@ -6,7 +6,7 @@ use rustc_abi::{AddressSpace, AlignFromBytesError, TargetDataLayoutError};

use crate::db::HirDatabase;

-#[salsa_macros::tracked(returns(as_ref))]

+#[salsa::tracked(returns(as_ref))]

pub fn target_data_layout_query(

db: &dyn HirDatabase,

krate: Crate,

diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index edc92b1e09..35cddf109a 100644
--- a/crates/hir-ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs

@@ -1621,7 +1621,7 @@ pub enum TyDefId {

}

impl_from!(BuiltinType, AdtId(StructId, EnumId, UnionId), TypeAliasId for TyDefId);

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa_macros::Supertype)]

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]

pub enum ValueTyDefId {

FunctionId(FunctionId),

StructId(StructId),

@@ -1681,7 +1681,7 @@ pub(crate) fn type_for_const<'db>(

}

/// Build the declared type of a const.

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub(crate) fn type_for_const_with_diagnostics<'db>(

db: &'db dyn HirDatabase,

def: ConstId,

@@ -1713,7 +1713,7 @@ pub(crate) fn type_for_static<'db>(

}

/// Build the declared type of a static.

-#[salsa_macros::tracked(returns(ref))]

+#[salsa::tracked(returns(ref))]

pub(crate) fn type_for_static_with_diagnostics<'db>(

db: &'db dyn HirDatabase,

def: StaticId,

@@ -2736,7 +2736,7 @@ pub(crate) fn generic_defaults(db: &dyn HirDatabase, def: GenericDefId) -> Gener

/// Resolve the default type params from generics.

///

/// Diagnostics are only returned for this `GenericDefId` (returned defaults include parents).

-#[salsa_macros::tracked(returns(ref), cycle_result = generic_defaults_with_diagnostics_cycle_result)]

+#[salsa::tracked(returns(ref), cycle_result = generic_defaults_with_diagnostics_cycle_result)]

pub(crate) fn generic_defaults_with_diagnostics<'db>(

db: &'db dyn HirDatabase,

def: GenericDefId,

diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 3a0fe6e249..ed7279790c 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs

@@ -2124,7 +2124,7 @@ fn cast_kind<'db>(

})

}

-#[salsa_macros::tracked(returns(as_ref), cycle_result = mir_body_for_closure_cycle_result)]

+#[salsa::tracked(returns(as_ref), cycle_result = mir_body_for_closure_cycle_result)]

pub fn mir_body_for_closure_query<'db>(

db: &'db dyn HirDatabase,

closure: InternedClosureId<'db>,

@@ -2283,7 +2283,7 @@ pub fn mir_body_for_closure_query<'db>(

Ok(ctx.result)

}

-#[salsa_macros::tracked(returns(as_ref), cycle_result = mir_body_cycle_result)]

+#[salsa::tracked(returns(as_ref), cycle_result = mir_body_cycle_result)]

pub fn mir_body_query<'db>(

db: &'db dyn HirDatabase,

def: InferBodyId<'db>,

diff --git a/crates/hir-ty/src/mir/monomorphization.rs b/crates/hir-ty/src/mir/monomorphization.rs
index 042dd076be..93d1aa515a 100644
--- a/crates/hir-ty/src/mir/monomorphization.rs
+++ b/crates/hir-ty/src/mir/monomorphization.rs

@@ -238,7 +238,7 @@ impl<'db> Filler<'db> {

}

-#[salsa_macros::tracked(returns(as_ref), cycle_result = monomorphized_mir_body_cycle_result)]

+#[salsa::tracked(returns(as_ref), cycle_result = monomorphized_mir_body_cycle_result)]

pub fn monomorphized_mir_body_query<'db>(

db: &'db dyn HirDatabase,

owner: InferBodyId<'db>,

@@ -262,7 +262,7 @@ fn monomorphized_mir_body_cycle_result<'db>(

Err(MirLowerError::Loop)

}

-#[salsa_macros::tracked(returns(as_ref), cycle_result = monomorphized_mir_body_for_closure_cycle_result)]

+#[salsa::tracked(returns(as_ref), cycle_result = monomorphized_mir_body_for_closure_cycle_result)]

pub fn monomorphized_mir_body_for_closure_query<'db>(

db: &'db dyn HirDatabase,

closure: InternedClosureId<'db>,

diff --git a/crates/hir-ty/src/test_db.rs b/crates/hir-ty/src/test_db.rs
index 7bf22b93f7..59fda51781 100644
--- a/crates/hir-ty/src/test_db.rs
+++ b/crates/hir-ty/src/test_db.rs

@@ -16,7 +16,7 @@ use syntax::TextRange;

use test_utils::extract_annotations;

use triomphe::Arc;

-#[salsa_macros::db]

+#[salsa::db]

pub(crate) struct TestDB {

storage: salsa::Storage<Self>,

files: Arc<base_db::Files>,

@@ -75,7 +75,7 @@ impl fmt::Debug for TestDB {

}

-#[salsa_macros::db]

+#[salsa::db]

impl SourceDatabase for TestDB {

fn file_text(&self, file_id: base_db::FileId) -> FileText {

self.files.file_text(file_id)

@@ -138,7 +138,7 @@ impl SourceDatabase for TestDB {

}

-#[salsa_macros::db]

+#[salsa::db]

impl salsa::Database for TestDB {}

impl panic::RefUnwindSafe for TestDB {}

diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
index c6b4d28169..930cb993e1 100644
--- a/crates/ide-db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs

@@ -78,7 +78,7 @@ pub use span::{self, FileId};

pub type FilePosition = FilePositionWrapper<FileId>;

pub type FileRange = FileRangeWrapper<FileId>;

-#[salsa_macros::db]

+#[salsa::db]

pub struct RootDatabase {

// FIXME: Revisit this commit now that we migrated to the new salsa, given we store arcs in this

// db directly now

@@ -94,7 +94,7 @@ pub struct RootDatabase {

impl std::panic::RefUnwindSafe for RootDatabase {}

-#[salsa_macros::db]

+#[salsa::db]

impl salsa::Database for RootDatabase {}

impl Drop for RootDatabase {

@@ -120,7 +120,7 @@ impl fmt::Debug for RootDatabase {

}

-#[salsa_macros::db]

+#[salsa::db]

impl SourceDatabase for RootDatabase {

fn file_text(&self, file_id: vfs::FileId) -> FileText {

self.files.file_text(file_id)