Skip to content

Commit 0caec7d

Browse files
matkladmatklad
committed
rename XSignature -> XData
1 parent 1541b2d commit 0caec7d

File tree

10 files changed

+66
-70
lines changed

10 files changed

+66
-70
lines changed

‎crates/ra_hir/src/code_model.rs

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,8 @@ pub struct Function {
519519
pub(crate) id: FunctionId,
520520
}
521521

522-
/// The declared signature of a function.
523522
#[derive(Debug, Clone, PartialEq, Eq)]
524-
pub struct FnSignature {
523+
pub struct FnData {
525524
pub(crate) name: Name,
526525
pub(crate) params: Vec<TypeRef>,
527526
pub(crate) ret_type: TypeRef,
@@ -530,11 +529,11 @@ pub struct FnSignature {
530529
pub(crate) has_self_param: bool,
531530
}
532531

533-
impl FnSignature {
534-
pub(crate) fn fn_signature_query(
532+
impl FnData {
533+
pub(crate) fn fn_data_query(
535534
db: &(impl DefDatabase + AstDatabase),
536535
func: Function,
537-
) -> Arc<FnSignature> {
536+
) -> Arc<FnData> {
538537
let src = func.source(db);
539538
let name = src.ast.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
540539
let mut params = Vec::new();
@@ -569,7 +568,7 @@ impl FnSignature {
569568
TypeRef::unit()
570569
};
571570

572-
let sig = FnSignature { name, params, ret_type, has_self_param };
571+
let sig = FnData { name, params, ret_type, has_self_param };
573572
Arc::new(sig)
574573
}
575574
pub fn name(&self) -> &Name {
@@ -597,7 +596,7 @@ impl Function {
597596
}
598597

599598
pub fn name(self, db: &impl HirDatabase) -> Name {
600-
self.signature(db).name.clone()
599+
self.data(db).name.clone()
601600
}
602601

603602
pub(crate) fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
@@ -612,8 +611,8 @@ impl Function {
612611
db.type_for_def(self.into(), Namespace::Values)
613612
}
614613

615-
pub fn signature(self, db: &impl HirDatabase) -> Arc<FnSignature> {
616-
db.fn_signature(self)
614+
pub fn data(self, db: &impl HirDatabase) -> Arc<FnData> {
615+
db.fn_data(self)
617616
}
618617

619618
pub fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> {
@@ -670,8 +669,8 @@ impl Const {
670669
self.id.module(db)
671670
}
672671

673-
pub fn signature(self, db: &impl HirDatabase) -> Arc<ConstSignature> {
674-
db.const_signature(self)
672+
pub fn data(self, db: &impl HirDatabase) -> Arc<ConstData> {
673+
db.const_data(self)
675674
}
676675

677676
pub fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> {
@@ -696,14 +695,13 @@ impl Const {
696695
}
697696
}
698697

699-
/// The declared signature of a const.
700698
#[derive(Debug, Clone, PartialEq, Eq)]
701-
pub struct ConstSignature {
699+
pub struct ConstData {
702700
pub(crate) name: Name,
703701
pub(crate) type_ref: TypeRef,
704702
}
705703

706-
impl ConstSignature {
704+
impl ConstData {
707705
pub fn name(&self) -> &Name {
708706
&self.name
709707
}
@@ -712,27 +710,27 @@ impl ConstSignature {
712710
&self.type_ref
713711
}
714712

715-
pub(crate) fn const_signature_query(
713+
pub(crate) fn const_data_query(
716714
db: &(impl DefDatabase + AstDatabase),
717715
konst: Const,
718-
) -> Arc<ConstSignature> {
716+
) -> Arc<ConstData> {
719717
let node = konst.source(db).ast;
720-
const_signature_for(&*node)
718+
const_data_for(&*node)
721719
}
722720

723-
pub(crate) fn static_signature_query(
721+
pub(crate) fn static_data_query(
724722
db: &(impl DefDatabase + AstDatabase),
725723
konst: Static,
726-
) -> Arc<ConstSignature> {
724+
) -> Arc<ConstData> {
727725
let node = konst.source(db).ast;
728-
const_signature_for(&*node)
726+
const_data_for(&*node)
729727
}
730728
}
731729

732-
fn const_signature_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<ConstSignature> {
730+
fn const_data_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<ConstData> {
733731
let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
734732
let type_ref = TypeRef::from_ast_opt(node.ascribed_type());
735-
let sig = ConstSignature { name, type_ref };
733+
let sig = ConstData { name, type_ref };
736734
Arc::new(sig)
737735
}
738736

@@ -746,8 +744,8 @@ impl Static {
746744
self.id.module(db)
747745
}
748746

749-
pub fn signature(self, db: &impl HirDatabase) -> Arc<ConstSignature> {
750-
db.static_signature(self)
747+
pub fn data(self, db: &impl HirDatabase) -> Arc<ConstData> {
748+
db.static_data(self)
751749
}
752750

753751
/// Builds a resolver for code inside this item.

‎crates/ra_hir/src/db.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use ra_db::{SourceDatabase, salsa};
66

77
use crate::{
88
HirFileId, MacroDefId, AstIdMap, ErasedFileAstId, Crate, Module, MacroCallLoc,
9-
Function, FnSignature, ExprScopes, TypeAlias,
9+
Function, FnData, ExprScopes, TypeAlias,
1010
Struct, Enum, StructField,
11-
Const, ConstSignature, Static,
11+
Const, ConstData, Static,
1212
DefWithBody, Trait,
1313
ids,
1414
nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap},
@@ -109,17 +109,17 @@ pub trait DefDatabase: SourceDatabase {
109109
#[salsa::invoke(crate::generics::GenericParams::generic_params_query)]
110110
fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>;
111111

112-
#[salsa::invoke(crate::FnSignature::fn_signature_query)]
113-
fn fn_signature(&self, func: Function) -> Arc<FnSignature>;
112+
#[salsa::invoke(crate::FnData::fn_data_query)]
113+
fn fn_data(&self, func: Function) -> Arc<FnData>;
114114

115115
#[salsa::invoke(crate::type_alias::type_alias_data_query)]
116116
fn type_alias_data(&self, typ: TypeAlias) -> Arc<TypeAliasData>;
117117

118-
#[salsa::invoke(crate::ConstSignature::const_signature_query)]
119-
fn const_signature(&self, konst: Const) -> Arc<ConstSignature>;
118+
#[salsa::invoke(crate::ConstData::const_data_query)]
119+
fn const_data(&self, konst: Const) -> Arc<ConstData>;
120120

121-
#[salsa::invoke(crate::ConstSignature::static_signature_query)]
122-
fn static_signature(&self, konst: Static) -> Arc<ConstSignature>;
121+
#[salsa::invoke(crate::ConstData::static_data_query)]
122+
fn static_data(&self, konst: Static) -> Arc<ConstData>;
123123

124124
#[salsa::invoke(crate::lang_item::LangItems::lang_items_query)]
125125
fn lang_items(&self, krate: Crate) -> Arc<LangItems>;

‎crates/ra_hir/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ pub use self::code_model::{
7575
DefWithBody,
7676
Module, ModuleDef, ModuleSource,
7777
Struct, Union, Enum, EnumVariant,
78-
Function, FnSignature,
78+
Function, FnData,
7979
StructField, FieldSource,
80-
Static, Const, ConstSignature,
80+
Static, Const, ConstData,
8181
Trait, TypeAlias, MacroDef, Container,
8282
BuiltinType,
8383
src::{Source, HasSource},

‎crates/ra_hir/src/ty/infer.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use ra_prof::profile;
2727
use test_utils::tested_by;
2828

2929
use crate::{
30-
Function, StructField, Path, Name, FnSignature, AdtDef, ConstSignature, HirDatabase,
30+
Function, StructField, Path, Name, FnData, AdtDef, ConstData, HirDatabase,
3131
DefWithBody, ImplItem,
3232
type_ref::{TypeRef, Mutability},
3333
expr::{
@@ -59,9 +59,9 @@ pub fn infer_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<InferenceResu
5959
let mut ctx = InferenceContext::new(db, body, resolver);
6060

6161
match def {
62-
DefWithBody::Const(ref c) => ctx.collect_const_signature(&c.signature(db)),
63-
DefWithBody::Function(ref f) => ctx.collect_fn_signature(&f.signature(db)),
64-
DefWithBody::Static(ref s) => ctx.collect_const_signature(&s.signature(db)),
62+
DefWithBody::Const(ref c) => ctx.collect_const(&c.data(db)),
63+
DefWithBody::Function(ref f) => ctx.collect_fn(&f.data(db)),
64+
DefWithBody::Static(ref s) => ctx.collect_const(&s.data(db)),
6565
}
6666

6767
ctx.infer_body();
@@ -509,17 +509,16 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
509509
let item: crate::ModuleDef = ty.iterate_impl_items(self.db, krate, |item| {
510510
let matching_def: Option<crate::ModuleDef> = match item {
511511
crate::ImplItem::Method(func) => {
512-
let sig = func.signature(self.db);
513-
if segment.name == *sig.name() {
512+
if segment.name == func.name(self.db) {
514513
Some(func.into())
515514
} else {
516515
None
517516
}
518517
}
519518

520519
crate::ImplItem::Const(konst) => {
521-
let sig = konst.signature(self.db);
522-
if segment.name == *sig.name() {
520+
let data = konst.data(self.db);
521+
if segment.name == *data.name() {
523522
Some(konst.into())
524523
} else {
525524
None
@@ -1283,18 +1282,18 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
12831282
ty
12841283
}
12851284

1286-
fn collect_const_signature(&mut self, signature: &ConstSignature) {
1287-
self.return_ty = self.make_ty(signature.type_ref());
1285+
fn collect_const(&mut self, data: &ConstData) {
1286+
self.return_ty = self.make_ty(data.type_ref());
12881287
}
12891288

1290-
fn collect_fn_signature(&mut self, signature: &FnSignature) {
1289+
fn collect_fn(&mut self, data: &FnData) {
12911290
let body = Arc::clone(&self.body); // avoid borrow checker problem
1292-
for (type_ref, pat) in signature.params().iter().zip(body.params()) {
1291+
for (type_ref, pat) in data.params().iter().zip(body.params()) {
12931292
let ty = self.make_ty(type_ref);
12941293

12951294
self.infer_pat(*pat, &ty, BindingMode::default());
12961295
}
1297-
self.return_ty = self.make_ty(signature.ret_type());
1296+
self.return_ty = self.make_ty(data.ret_type());
12981297
}
12991298

13001299
fn infer_body(&mut self) {

‎crates/ra_hir/src/ty/lower.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,10 @@ pub(crate) fn generic_defaults(db: &impl HirDatabase, def: GenericDef) -> Substs
353353
}
354354

355355
fn fn_sig_for_fn(db: &impl HirDatabase, def: Function) -> FnSig {
356-
let signature = def.signature(db);
356+
let data = def.data(db);
357357
let resolver = def.resolver(db);
358-
let params =
359-
signature.params().iter().map(|tr| Ty::from_hir(db, &resolver, tr)).collect::<Vec<_>>();
360-
let ret = Ty::from_hir(db, &resolver, signature.ret_type());
358+
let params = data.params().iter().map(|tr| Ty::from_hir(db, &resolver, tr)).collect::<Vec<_>>();
359+
let ret = Ty::from_hir(db, &resolver, data.ret_type());
361360
FnSig::from_params_and_return(params, ret)
362361
}
363362

@@ -371,18 +370,18 @@ fn type_for_fn(db: &impl HirDatabase, def: Function) -> Ty {
371370

372371
/// Build the declared type of a const.
373372
fn type_for_const(db: &impl HirDatabase, def: Const) -> Ty {
374-
let signature = def.signature(db);
373+
let data = def.data(db);
375374
let resolver = def.resolver(db);
376375

377-
Ty::from_hir(db, &resolver, signature.type_ref())
376+
Ty::from_hir(db, &resolver, data.type_ref())
378377
}
379378

380379
/// Build the declared type of a static.
381380
fn type_for_static(db: &impl HirDatabase, def: Static) -> Ty {
382-
let signature = def.signature(db);
381+
let data = def.data(db);
383382
let resolver = def.resolver(db);
384383

385-
Ty::from_hir(db, &resolver, signature.type_ref())
384+
Ty::from_hir(db, &resolver, data.type_ref())
386385
}
387386

388387
/// Build the declared type of a static.

‎crates/ra_hir/src/ty/method_resolution.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ fn iterate_trait_method_candidates<T>(
192192
let mut known_implemented = false;
193193
for item in data.items() {
194194
if let TraitItem::Function(m) = *item {
195-
let sig = m.signature(db);
196-
if name.map_or(true, |name| sig.name() == name) && sig.has_self_param() {
195+
let data = m.data(db);
196+
if name.map_or(true, |name| data.name() == name) && data.has_self_param() {
197197
if !known_implemented {
198198
let trait_ref = canonical_trait_ref(db, t, ty.clone());
199199
if db.implements(krate, trait_ref).is_none() {
@@ -227,8 +227,8 @@ fn iterate_inherent_methods<T>(
227227
for impl_block in impls.lookup_impl_blocks(&ty.value) {
228228
for item in impl_block.items(db) {
229229
if let ImplItem::Method(f) = item {
230-
let sig = f.signature(db);
231-
if name.map_or(true, |name| sig.name() == name) && sig.has_self_param() {
230+
let data = f.data(db);
231+
if name.map_or(true, |name| data.name() == name) && data.has_self_param() {
232232
if let Some(result) = callback(&ty.value, f) {
233233
return Some(result);
234234
}

‎crates/ra_ide_api/src/call_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
3535

3636
// If we have a calling expression let's find which argument we are on
3737
let num_params = call_info.parameters().len();
38-
let has_self = function.signature(db).has_self_param();
38+
let has_self = function.data(db).has_self_param();
3939

4040
if num_params == 1 {
4141
if !has_self {

‎crates/ra_ide_api/src/completion/complete_dot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
3737

3838
fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) {
3939
ctx.analyzer.iterate_method_candidates(ctx.db, receiver, None, |_ty, func| {
40-
let sig = func.signature(ctx.db);
41-
if sig.has_self_param() {
40+
let data = func.data(ctx.db);
41+
if data.has_self_param() {
4242
acc.add_function(ctx, func);
4343
}
4444
None::<()>

‎crates/ra_ide_api/src/completion/complete_path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
4949
ty.iterate_impl_items(ctx.db, krate, |item| {
5050
match item {
5151
hir::ImplItem::Method(func) => {
52-
let sig = func.signature(ctx.db);
53-
if !sig.has_self_param() {
52+
let data = func.data(ctx.db);
53+
if !data.has_self_param() {
5454
acc.add_function(ctx, func);
5555
}
5656
}

‎crates/ra_ide_api/src/completion/presentation.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ impl Completions {
9898
name: Option<String>,
9999
func: hir::Function,
100100
) {
101-
let sig = func.signature(ctx.db);
102-
let name = name.unwrap_or_else(|| sig.name().to_string());
101+
let data = func.data(ctx.db);
102+
let name = name.unwrap_or_else(|| data.name().to_string());
103103
let ast_node = func.source(ctx.db).ast;
104104
let detail = function_label(&ast_node);
105105

106106
let mut builder = CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name)
107-
.kind(if sig.has_self_param() {
107+
.kind(if data.has_self_param() {
108108
CompletionItemKind::Method
109109
} else {
110110
CompletionItemKind::Function
@@ -115,10 +115,10 @@ impl Completions {
115115
if ctx.use_item_syntax.is_none() && !ctx.is_call {
116116
tested_by!(inserts_parens_for_function_calls);
117117
let snippet =
118-
if sig.params().is_empty() || sig.has_self_param() && sig.params().len() == 1 {
119-
format!("{}()$0", sig.name())
118+
if data.params().is_empty() || data.has_self_param() && data.params().len() == 1 {
119+
format!("{}()$0", data.name())
120120
} else {
121-
format!("{}($0)", sig.name())
121+
format!("{}($0)", data.name())
122122
};
123123
builder = builder.insert_snippet(snippet);
124124
}

0 commit comments

Comments
 (0)