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

Unfork struct and union ids

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-09 15:34:00 +03:00
parent defc7ad772
commit 6294fd5ec9
10 changed files with 51 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_hir/src/code_model.rs
View file

@ -288,7 +288,7 @@ pub struct Struct {
impl Struct {
pub fn module(self, db: &impl DefDatabase) -> Module {
Module { id: self.id.module(db) }
Module { id: self.id.0.module(db) }
}
pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
@ -296,11 +296,11 @@ impl Struct {
}
pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
db.struct_data(self.id).name.clone()
db.struct_data(self.id.into()).name.clone()
}
pub fn fields(self, db: &impl HirDatabase) -> Vec<StructField> {
db.struct_data(self.id)
db.struct_data(self.id.into())
.variant_data
.fields()
.into_iter()
@ -310,7 +310,7 @@ impl Struct {
}
pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option<StructField> {
db.struct_data(self.id)
db.struct_data(self.id.into())
.variant_data
.fields()
.into_iter()
@ -346,11 +346,11 @@ pub struct Union {
impl Union {
pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
db.union_data(self.id).name.clone()
db.struct_data(self.id.into()).name.clone()
}
pub fn module(self, db: &impl HirDatabase) -> Module {
Module { id: self.id.module(db) }
Module { id: self.id.0.module(db) }
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {