Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 13:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-25 12:57:15 +02:00
parent 575fb9ab6a
commit 7487885309
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/hir/src/attrs.rs
View file

@ -1,3 +1,4 @@
//! Attributes & documentation for hir types.
use hir_def::{ use hir_def::{
attr::Attrs, attr::Attrs,
db::DefDatabase, db::DefDatabase,
@ -11,7 +12,6 @@ use stdx::impl_from;
use crate::{ use crate::{
doc_links::Resolvable, Adt, Const, Enum, EnumVariant, Field, Function, GenericDef, ImplDef, doc_links::Resolvable, Adt, Const, Enum, EnumVariant, Field, Function, GenericDef, ImplDef,
Local, MacroDef, Module, ModuleDef, Static, Struct, Trait, TypeAlias, TypeParam, Union, Local, MacroDef, Module, ModuleDef, Static, Struct, Trait, TypeAlias, TypeParam, Union,
VariantDef,
}; };
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
@ -83,7 +83,7 @@ impl Resolvable for ModuleDef {
impl Resolvable for TypeParam { impl Resolvable for TypeParam {
fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(Into::<ModuleId>::into(self.module(db)).resolver(db)) Some(ModuleId::from(self.module(db)).resolver(db))
} }
fn try_into_module_def(self) -> Option<ModuleDef> { fn try_into_module_def(self) -> Option<ModuleDef> {
@ -93,7 +93,7 @@ impl Resolvable for TypeParam {
impl Resolvable for MacroDef { impl Resolvable for MacroDef {
fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(Into::<ModuleId>::into(self.module(db)?).resolver(db)) Some(ModuleId::from(self.module(db)?).resolver(db))
} }
fn try_into_module_def(self) -> Option<ModuleDef> { fn try_into_module_def(self) -> Option<ModuleDef> {
@ -103,7 +103,7 @@ impl Resolvable for MacroDef {
impl Resolvable for Field { impl Resolvable for Field {
fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(Into::<VariantId>::into(Into::<VariantDef>::into(self.parent_def(db))).resolver(db)) Some(VariantId::from(self.parent_def(db)).resolver(db))
} }
fn try_into_module_def(self) -> Option<ModuleDef> { fn try_into_module_def(self) -> Option<ModuleDef> {
@ -113,7 +113,7 @@ impl Resolvable for Field {
impl Resolvable for ImplDef { impl Resolvable for ImplDef {
fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(Into::<ModuleId>::into(self.module(db)).resolver(db)) Some(ModuleId::from(self.module(db)).resolver(db))
} }
fn try_into_module_def(self) -> Option<ModuleDef> { fn try_into_module_def(self) -> Option<ModuleDef> {
@ -123,7 +123,7 @@ impl Resolvable for ImplDef {
impl Resolvable for Local { impl Resolvable for Local {
fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(Into::<ModuleId>::into(self.module(db)).resolver(db)) Some(ModuleId::from(self.module(db)).resolver(db))
} }
fn try_into_module_def(self) -> Option<ModuleDef> { fn try_into_module_def(self) -> Option<ModuleDef> {