squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #5867

Browse source 
5867: Use the same abstraction for attrs and docs
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-08-25 10:14:45 +00:00 committed by GitHub
commit 4f91478e50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/hir/src/code_model.rs
View file

@ -1771,6 +1771,7 @@ impl_from!(
pub trait HasAttrs {
fn attrs(self, db: &dyn HirDatabase) -> Attrs;
fn docs(self, db: &dyn HirDatabase) -> Option<Documentation>;
}
impl<T: Into<AttrDef>> HasAttrs for T {
@ -1778,14 +1779,8 @@ impl<T: Into<AttrDef>> HasAttrs for T {
let def: AttrDef = self.into();
db.attrs(def.into())
}
}
pub trait Docs {
fn docs(&self, db: &dyn HirDatabase) -> Option<Documentation>;
}
impl<T: Into<AttrDef> + Copy> Docs for T {
fn docs(&self, db: &dyn HirDatabase) -> Option<Documentation> {
let def: AttrDef = (*self).into();
fn docs(self, db: &dyn HirDatabase) -> Option<Documentation> {
let def: AttrDef = self.into();
db.documentation(def.into())
}
}

2
crates/hir/src/lib.rs
View file

@ -34,7 +34,7 @@ mod has_source;
pub use crate::{
code_model::{
Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Callable, CallableKind,
Const, Crate, CrateDependency, DefWithBody, Docs, Enum, EnumVariant, Field, FieldSource,
Const, Crate, CrateDependency, DefWithBody, Enum, EnumVariant, Field, FieldSource,
Function, GenericDef, HasAttrs, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef,
ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
},

2
crates/ide/src/call_info.rs
View file

@ -1,6 +1,6 @@
//! FIXME: write short doc here
use either::Either;
use hir::{Docs, HirDisplay, Semantics, Type};
use hir::{HasAttrs, HirDisplay, Semantics, Type};
use ide_db::RootDatabase;
use stdx::format_to;
use syntax::{

2
crates/ide/src/completion/complete_trait_impl.rs
View file

@ -32,7 +32,7 @@
//! ```
use assists::utils::get_missing_assoc_items;
use hir::{self, Docs, HasSource};
use hir::{self, HasAttrs, HasSource};
use syntax::{
ast::{self, edit, Impl},
AstNode, SyntaxKind, SyntaxNode, TextRange, T,

2
crates/ide/src/completion/presentation.rs
View file

@ -1,7 +1,7 @@
//! This modules takes care of rendering various definitions as completion items.
//! It also handles scoring (sorting) completions.
use hir::{Docs, HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type};
use hir::{HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type};
use itertools::Itertools;
use syntax::ast::NameOwner;
use test_utils::mark;