From e85ee60c42db57368e24ad9ac24840c2494d383c Mon Sep 17 00:00:00 2001
From: Marco Groppo <marco.groppo@gmail.com>
Date: Mon, 15 Apr 2019 00:03:54 +0200
Subject: Initial support for lang items.

---
 crates/ra_hir/src/db.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'crates/ra_hir/src/db.rs')

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 18627bbc2..b27efcbe3 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -16,6 +16,7 @@ use crate::{
     generics::{GenericParams, GenericDef},
     type_ref::TypeRef,
     traits::TraitData, Trait, ty::TraitRef,
+    lang_item::LangItems,
     ids
 };
 
@@ -100,6 +101,9 @@ pub trait DefDatabase: SourceDatabase {
 
     #[salsa::invoke(crate::ConstSignature::static_signature_query)]
     fn static_signature(&self, konst: Static) -> Arc<ConstSignature>;
+
+    #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)]
+    fn lang_items(&self, krate: Crate) -> Arc<LangItems>;
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
-- 
cgit v1.2.3


From 8ac3d1f9aa892fc891b69c7d8d00d39b9371d246 Mon Sep 17 00:00:00 2001
From: Marco Groppo <marco.groppo@gmail.com>
Date: Thu, 18 Apr 2019 20:34:10 +0200
Subject: lang_item_lookup is now a salsa query.

---
 crates/ra_hir/src/db.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'crates/ra_hir/src/db.rs')

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index b27efcbe3..8af0a3176 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use ra_syntax::{SyntaxNode, TreeArc, SourceFile, ast};
+use ra_syntax::{SyntaxNode, TreeArc, SourceFile, SmolStr, ast};
 use ra_db::{SourceDatabase, salsa};
 
 use crate::{
@@ -16,7 +16,7 @@ use crate::{
     generics::{GenericParams, GenericDef},
     type_ref::TypeRef,
     traits::TraitData, Trait, ty::TraitRef,
-    lang_item::LangItems,
+    lang_item::{LangItems, LangItemTarget},
     ids
 };
 
@@ -104,6 +104,9 @@ pub trait DefDatabase: SourceDatabase {
 
     #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)]
     fn lang_items(&self, krate: Crate) -> Arc<LangItems>;
+
+    #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)]
+    fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>;
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
-- 
cgit v1.2.3