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

Minor code style

Browse source
This commit is contained in:
Aleksey Kladov 2020-12-17 18:27:24 +03:00
parent 4368a3bceb
commit 0da1532ef2
1 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/ide/src/runnables.rs
View file

@ -111,21 +111,17 @@ pub(crate) fn runnable(
} }
} }
fn runnable_fn( fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -> Option<Runnable> {
sema: &Semantics<RootDatabase>, let def = sema.to_def(&func)?;
fn_def: ast::Fn, let name_string = func.name()?.text().to_string();
file_id: FileId,
) -> Option<Runnable> {
let def = sema.to_def(&fn_def)?;
let name_string = fn_def.name()?.text().to_string();
let attrs = def.attrs(sema.db); let attrs = def.attrs(sema.db);
let kind = if name_string == "main" { let kind = if name_string == "main" {
RunnableKind::Bin RunnableKind::Bin
} else { } else {
let test_id = match sema.to_def(&fn_def).map(|def| def.module(sema.db)) { let test_id = match sema.to_def(&func).map(|def| def.module(sema.db)) {
Some(module) => { Some(module) => {
let def = sema.to_def(&fn_def)?; let def = sema.to_def(&func)?;
let impl_trait_name = def.as_assoc_item(sema.db).and_then(|assoc_item| { let impl_trait_name = def.as_assoc_item(sema.db).and_then(|assoc_item| {
match assoc_item.container(sema.db) { match assoc_item.container(sema.db) {
hir::AssocItemContainer::Trait(trait_item) => { hir::AssocItemContainer::Trait(trait_item) => {
@ -159,10 +155,10 @@ fn runnable_fn(
None => TestId::Name(name_string), None => TestId::Name(name_string),
}; };
if test_related_attribute(&fn_def).is_some() { if test_related_attribute(&func).is_some() {
let attr = TestAttr::from_fn(&fn_def); let attr = TestAttr::from_fn(&func);
RunnableKind::Test { test_id, attr } RunnableKind::Test { test_id, attr }
} else if fn_def.has_atom_attr("bench") { } else if func.has_atom_attr("bench") {
RunnableKind::Bench { test_id } RunnableKind::Bench { test_id }
} else if has_runnable_doc_test(&attrs) { } else if has_runnable_doc_test(&attrs) {
RunnableKind::DocTest { test_id } RunnableKind::DocTest { test_id }
@ -171,35 +167,31 @@ fn runnable_fn(
} }
}; };
let cfg = attrs.cfg();
let nav = if let RunnableKind::DocTest { .. } = kind { let nav = if let RunnableKind::DocTest { .. } = kind {
NavigationTarget::from_doc_commented( NavigationTarget::from_doc_commented(
sema.db, sema.db,
InFile::new(file_id.into(), &fn_def), InFile::new(file_id.into(), &func),
InFile::new(file_id.into(), &fn_def), InFile::new(file_id.into(), &func),
) )
} else { } else {
NavigationTarget::from_named(sema.db, InFile::new(file_id.into(), &fn_def)) NavigationTarget::from_named(sema.db, InFile::new(file_id.into(), &func))
}; };
Some(Runnable { nav, kind, cfg }) Some(Runnable { nav, kind, cfg: attrs.cfg() })
} }
fn runnable_struct( fn runnable_struct(
sema: &Semantics<RootDatabase>, sema: &Semantics<RootDatabase>,
struct_def: ast::Struct, strukt: ast::Struct,
file_id: FileId, file_id: FileId,
) -> Option<Runnable> { ) -> Option<Runnable> {
let def = sema.to_def(&struct_def)?; let def = sema.to_def(&strukt)?;
let name_string = struct_def.name()?.text().to_string(); let name_string = strukt.name()?.text().to_string();
let attrs = def.attrs(sema.db); let attrs = def.attrs(sema.db);
if !has_runnable_doc_test(&attrs) { if !has_runnable_doc_test(&attrs) {
return None; return None;
} }
let cfg = attrs.cfg(); let test_id = match sema.to_def(&strukt).map(|def| def.module(sema.db)) {
let test_id = match sema.to_def(&struct_def).map(|def| def.module(sema.db)) {
Some(module) => { Some(module) => {
let path_iter = module let path_iter = module
.path_to_root(sema.db) .path_to_root(sema.db)
@ -216,10 +208,10 @@ fn runnable_struct(
let nav = NavigationTarget::from_doc_commented( let nav = NavigationTarget::from_doc_commented(
sema.db, sema.db,
InFile::new(file_id.into(), &struct_def), InFile::new(file_id.into(), &strukt),
InFile::new(file_id.into(), &struct_def), InFile::new(file_id.into(), &strukt),
); );
Some(Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg }) Some(Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg: attrs.cfg() })
} }
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]