language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix builtin_crates return type change

Browse source
This commit is contained in:
lhvy 2021-10-01 02:05:00 +10:00
parent 64cbdf6d55
commit 0b2ba8be68
No known key found for this signature in database
GPG key ID: E6CAEAA74B3C53AC
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -515,7 +515,7 @@ fn highlight_def(
}); });
let is_from_other_crate = def_crate != krate; let is_from_other_crate = def_crate != krate;
let is_from_builtin_crate = let is_from_builtin_crate =
def_crate.map_or(false, |it| famous_defs.builtin_crates().contains(&it)); def_crate.map_or(false, |def_crate| famous_defs.builtin_crates().any(|it| def_crate == it));
let is_builtin_type = matches!(def, Definition::ModuleDef(hir::ModuleDef::BuiltinType(_))); let is_builtin_type = matches!(def, Definition::ModuleDef(hir::ModuleDef::BuiltinType(_)));
let is_public = def.visibility(db) == Some(hir::Visibility::Public); let is_public = def.visibility(db) == Some(hir::Visibility::Public);
@ -564,7 +564,7 @@ fn highlight_method_call(
let famous_defs = FamousDefs(&sema, krate); let famous_defs = FamousDefs(&sema, krate);
let def_crate = func.module(sema.db).krate(); let def_crate = func.module(sema.db).krate();
let is_from_other_crate = Some(def_crate) != krate; let is_from_other_crate = Some(def_crate) != krate;
let is_from_builtin_crate = famous_defs.builtin_crates().contains(&def_crate); let is_from_builtin_crate = famous_defs.builtin_crates().any(|it| def_crate == it);
let is_public = func.visibility(sema.db) == hir::Visibility::Public; let is_public = func.visibility(sema.db) == hir::Visibility::Public;
if is_from_other_crate { if is_from_other_crate {