itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2026-03-12 20:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21171 from Veykril/push-puuqoostoysw

Browse Source 
minor: Option-box `crate_lang_items` query result
This commit is contained in:
Laurențiu Nicola 2025-12-01 10:40:41 +00:00 committed by GitHub
commit cbdd9c9102
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/hir-def/src/lang_item.rs
View File

@ -31,8 +31,8 @@ impl_from!(
);
/// Salsa query. This will look for lang items in a specific crate.
#[salsa_macros::tracked(returns(ref))]
pub fn crate_lang_items(db: &dyn DefDatabase, krate: Crate) -> LangItems {
#[salsa_macros::tracked(returns(as_deref))]
pub fn crate_lang_items(db: &dyn DefDatabase, krate: Crate) -> Option<Box<LangItems>> {
let _p = tracing::info_span!("crate_lang_items_query").entered();
let mut lang_items = LangItems::default();
@ -93,7 +93,7 @@ pub fn crate_lang_items(db: &dyn DefDatabase, krate: Crate) -> LangItems {
}
}
lang_items
if lang_items.is_empty() { None } else { Some(Box::new(lang_items)) }
}
/// Salsa query. Look for a lang items, starting from the specified crate and recursively
@ -102,7 +102,7 @@ pub fn crate_lang_items(db: &dyn DefDatabase, krate: Crate) -> LangItems {
pub fn lang_items(db: &dyn DefDatabase, start_crate: Crate) -> LangItems {
let _p = tracing::info_span!("lang_items_query").entered();
let mut result = crate_lang_items(db, start_crate).clone();
let mut result = crate_lang_items(db, start_crate).cloned().unwrap_or_default();
// Our `CrateGraph` eagerly inserts sysroot dependencies like `core` or `std` into dependencies
// even if the target crate has `#![no_std]`, `#![no_core]` or shadowed sysroot dependencies
@ -174,6 +174,10 @@ macro_rules! language_item_table {
}
impl LangItems {
fn is_empty(&self) -> bool {
$( self.$lang_item.is_none() )&&*
}
/// Merges `self` with `other`, with preference to `self` items.
fn merge_prefer_self(&mut self, other: &Self) {
$( self.$lang_item = self.$lang_item.or(other.$lang_item); )*