Skip to content

Commit d174158

Browse files
VeykrilVeykril
committed
Rename things: Tool -> ToolModule
1 parent 70b8331 commit d174158

File tree

17 files changed

+33
-33
lines changed

17 files changed

+33
-33
lines changed

‎crates/hir/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,9 +2039,9 @@ impl BuiltinAttr {
20392039
}
20402040

20412041
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
2042-
pub struct Tool(usize);
2042+
pub struct ToolModule(usize);
20432043

2044-
impl Tool {
2044+
impl ToolModule {
20452045
pub(crate) fn by_name(name: &str) -> Option<Self> {
20462046
// FIXME: def maps registered tools
20472047
hir_def::builtin_attr::TOOL_MODULES.iter().position(|&tool| tool == name).map(Self)

‎crates/hir/src/semantics.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::{
2727
source_analyzer::{resolve_hir_path, resolve_hir_path_as_macro, SourceAnalyzer},
2828
Access, AssocItem, BuiltinAttr, Callable, ConstParam, Crate, Field, Function, HasSource,
2929
HirFileId, Impl, InFile, Label, LifetimeParam, Local, MacroDef, Module, ModuleDef, Name, Path,
30-
ScopeDef, Tool, Trait, Type, TypeAlias, TypeParam, VariantDef,
30+
ScopeDef, ToolModule, Trait, Type, TypeAlias, TypeParam, VariantDef,
3131
};
3232

3333
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -44,7 +44,7 @@ pub enum PathResolution {
4444
Macro(MacroDef),
4545
AssocItem(AssocItem),
4646
BuiltinAttr(BuiltinAttr),
47-
Tool(Tool),
47+
ToolModule(ToolModule),
4848
}
4949

5050
impl PathResolution {
@@ -66,7 +66,7 @@ impl PathResolution {
6666
Some(TypeNs::TypeAliasId((*alias).into()))
6767
}
6868
PathResolution::BuiltinAttr(_)
69-
| PathResolution::Tool(_)
69+
| PathResolution::ToolModule(_)
7070
| PathResolution::Local(_)
7171
| PathResolution::Macro(_)
7272
| PathResolution::ConstParam(_) => None,

‎crates/hir/src/source_analyzer.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use syntax::{
3030

3131
use crate::{
3232
db::HirDatabase, semantics::PathResolution, Adt, BuiltinAttr, BuiltinType, Const, Field,
33-
Function, Local, MacroDef, ModuleDef, Static, Struct, Tool, Trait, Type, TypeAlias, TypeParam,
34-
Variant,
33+
Function, Local, MacroDef, ModuleDef, Static, Struct, ToolModule, Trait, Type, TypeAlias,
34+
TypeParam, Variant,
3535
};
3636
use base_db::CrateId;
3737

@@ -341,8 +341,8 @@ impl SourceAnalyzer {
341341
None => path.as_single_name_ref().and_then(|name_ref| {
342342
if let builtin @ Some(_) = BuiltinAttr::by_name(&name_ref.text()) {
343343
builtin.map(PathResolution::BuiltinAttr)
344-
} else if let tool @ Some(_) = Tool::by_name(&name_ref.text()) {
345-
tool.map(PathResolution::Tool)
344+
} else if let tool @ Some(_) = ToolModule::by_name(&name_ref.text()) {
345+
tool.map(PathResolution::ToolModule)
346346
} else {
347347
None
348348
}
@@ -362,8 +362,8 @@ impl SourceAnalyzer {
362362
None if is_path_of_attr => path
363363
.first_segment()
364364
.and_then(|seg| seg.name_ref())
365-
.and_then(|name_ref| Tool::by_name(&name_ref.text()))
366-
.map(PathResolution::Tool),
365+
.and_then(|name_ref| ToolModule::by_name(&name_ref.text()))
366+
.map(PathResolution::ToolModule),
367367
None => None,
368368
}
369369
}

‎crates/ide/src/doc_links.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ pub(crate) fn resolve_doc_path_for_def(
182182
Definition::Macro(it) => it.resolve_doc_path(db, link, ns),
183183
Definition::Field(it) => it.resolve_doc_path(db, link, ns),
184184
Definition::BuiltinAttr(_)
185-
| Definition::Tool(_)
185+
| Definition::ToolModule(_)
186186
| Definition::BuiltinType(_)
187187
| Definition::SelfType(_)
188188
| Definition::Local(_)
@@ -498,7 +498,7 @@ fn filename_and_frag_for_def(
498498
| Definition::GenericParam(_)
499499
| Definition::Label(_)
500500
| Definition::BuiltinAttr(_)
501-
| Definition::Tool(_) => return None,
501+
| Definition::ToolModule(_) => return None,
502502
};
503503

504504
Some((def, res, None))

‎crates/ide/src/hover/render.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ pub(super) fn definition(
371371
Definition::Label(it) => return Some(Markup::fenced_block(&it.name(db))),
372372
// FIXME: We should be able to show more info about these
373373
Definition::BuiltinAttr(it) => return Some(Markup::fenced_block(&it.name(db))),
374-
Definition::Tool(it) => return Some(Markup::fenced_block(&it.name(db))),
374+
Definition::ToolModule(it) => return Some(Markup::fenced_block(&it.name(db))),
375375
};
376376

377377
markup(docs.filter(|_| config.documentation.is_some()).map(Into::into), label, mod_path)

‎crates/ide/src/navigation_target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl TryToNav for Definition {
214214
Definition::Trait(it) => it.try_to_nav(db),
215215
Definition::TypeAlias(it) => it.try_to_nav(db),
216216
Definition::BuiltinType(_) => None,
217-
Definition::Tool(_) => None,
217+
Definition::ToolModule(_) => None,
218218
Definition::BuiltinAttr(_) => None,
219219
}
220220
}

‎crates/ide/src/syntax_highlighting.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub struct HlRange {
115115
// parameter:: Emitted for non-self function parameters.
116116
// property:: Emitted for struct and union fields.
117117
// selfKeyword:: Emitted for the self function parameter and self path-specifier.
118-
// tool:: Emitted for tool modules.
118+
// toolModule:: Emitted for tool modules.
119119
// typeParameter:: Emitted for type parameters.
120120
// unresolvedReference:: Emitted for unresolved references, names that rust-analyzer can't find the definition of.
121121
// variable:: Emitted for locals, constants and statics.

‎crates/ide/src/syntax_highlighting/highlight.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ fn highlight_def(
513513
}
514514
Definition::Label(_) => Highlight::new(HlTag::Symbol(SymbolKind::Label)),
515515
Definition::BuiltinAttr(_) => Highlight::new(HlTag::Symbol(SymbolKind::BuiltinAttr)),
516-
Definition::Tool(_) => Highlight::new(HlTag::Symbol(SymbolKind::Tool)),
516+
Definition::ToolModule(_) => Highlight::new(HlTag::Symbol(SymbolKind::ToolModule)),
517517
};
518518

519519
let famous_defs = FamousDefs(sema, krate);

‎crates/ide/src/syntax_highlighting/inject.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fn module_def_to_hl_tag(def: Definition) -> HlTag {
264264
},
265265
Definition::Label(_) => SymbolKind::Label,
266266
Definition::BuiltinAttr(_) => SymbolKind::BuiltinAttr,
267-
Definition::Tool(_) => SymbolKind::Tool,
267+
Definition::ToolModule(_) => SymbolKind::ToolModule,
268268
};
269269
HlTag::Symbol(symbol)
270270
}

‎crates/ide/src/syntax_highlighting/tags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl HlTag {
139139
SymbolKind::SelfParam => "self_keyword",
140140
SymbolKind::Static => "static",
141141
SymbolKind::Struct => "struct",
142-
SymbolKind::Tool => "tool",
142+
SymbolKind::ToolModule => "tool_module",
143143
SymbolKind::Trait => "trait",
144144
SymbolKind::TypeAlias => "type_alias",
145145
SymbolKind::TypeParam => "type_param",

‎crates/ide_completion/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl CompletionItemKind {
247247
SymbolKind::SelfParam => "sp",
248248
SymbolKind::Static => "sc",
249249
SymbolKind::Struct => "st",
250-
SymbolKind::Tool => "tl",
250+
SymbolKind::ToolModule => "tm",
251251
SymbolKind::Trait => "tt",
252252
SymbolKind::TypeAlias => "ta",
253253
SymbolKind::TypeParam => "tp",

‎crates/ide_db/src/defs.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use arrayvec::ArrayVec;
99
use hir::{
1010
Adt, AsAssocItem, AssocItem, BuiltinAttr, BuiltinType, Const, Field, Function, GenericParam,
1111
HasVisibility, Impl, ItemInNs, Label, Local, MacroDef, Module, ModuleDef, Name, PathResolution,
12-
Semantics, Static, Tool, Trait, TypeAlias, Variant, Visibility,
12+
Semantics, Static, ToolModule, Trait, TypeAlias, Variant, Visibility,
1313
};
1414
use stdx::impl_from;
1515
use syntax::{
@@ -38,7 +38,7 @@ pub enum Definition {
3838
GenericParam(GenericParam),
3939
Label(Label),
4040
BuiltinAttr(BuiltinAttr),
41-
Tool(Tool),
41+
ToolModule(ToolModule),
4242
}
4343

4444
impl Definition {
@@ -129,7 +129,7 @@ impl Definition {
129129
Definition::Local(it) => it.module(db),
130130
Definition::GenericParam(it) => it.module(db),
131131
Definition::Label(it) => it.module(db),
132-
Definition::BuiltinAttr(_) | Definition::BuiltinType(_) | Definition::Tool(_) => {
132+
Definition::BuiltinAttr(_) | Definition::BuiltinType(_) | Definition::ToolModule(_) => {
133133
return None
134134
}
135135
};
@@ -150,7 +150,7 @@ impl Definition {
150150
Definition::BuiltinType(_) => Visibility::Public,
151151
Definition::Macro(_) => return None,
152152
Definition::BuiltinAttr(_)
153-
| Definition::Tool(_)
153+
| Definition::ToolModule(_)
154154
| Definition::SelfType(_)
155155
| Definition::Local(_)
156156
| Definition::GenericParam(_)
@@ -177,7 +177,7 @@ impl Definition {
177177
Definition::GenericParam(it) => it.name(db),
178178
Definition::Label(it) => it.name(db),
179179
Definition::BuiltinAttr(_) => return None, // FIXME
180-
Definition::Tool(_) => return None, // FIXME
180+
Definition::ToolModule(_) => return None, // FIXME
181181
};
182182
Some(name)
183183
}
@@ -551,7 +551,7 @@ impl From<PathResolution> for Definition {
551551
PathResolution::SelfType(impl_def) => Definition::SelfType(impl_def),
552552
PathResolution::ConstParam(par) => Definition::GenericParam(par.into()),
553553
PathResolution::BuiltinAttr(attr) => Definition::BuiltinAttr(attr),
554-
PathResolution::Tool(tool) => Definition::Tool(tool),
554+
PathResolution::ToolModule(tool) => Definition::ToolModule(tool),
555555
}
556556
}
557557
}

‎crates/ide_db/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub enum SymbolKind {
160160
SelfParam,
161161
Static,
162162
Struct,
163-
Tool,
163+
ToolModule,
164164
Trait,
165165
TypeAlias,
166166
TypeParam,

‎crates/ide_db/src/path_transform.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl<'a> Ctx<'a> {
166166
| hir::PathResolution::Macro(_)
167167
| hir::PathResolution::AssocItem(_)
168168
| hir::PathResolution::BuiltinAttr(_)
169-
| hir::PathResolution::Tool(_) => (),
169+
| hir::PathResolution::ToolModule(_) => (),
170170
}
171171
Some(())
172172
}

‎crates/ide_db/src/rename.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl Definition {
147147
Definition::BuiltinType(_) => return None,
148148
Definition::SelfType(_) => return None,
149149
Definition::BuiltinAttr(_) => return None,
150-
Definition::Tool(_) => return None,
150+
Definition::ToolModule(_) => return None,
151151
};
152152
return res;
153153

‎crates/rust-analyzer/src/semantic_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ define_semantic_token_types![
6565
(SELF_KEYWORD, "selfKeyword"),
6666
(SEMICOLON, "semicolon"),
6767
(TYPE_ALIAS, "typeAlias"),
68-
(TOOL, "tool"),
68+
(TOOL_MODULE, "toolModule"),
6969
(UNION, "union"),
7070
(UNRESOLVED_REFERENCE, "unresolvedReference"),
7171
];

‎crates/rust-analyzer/src/to_proto.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
5151
SymbolKind::Variant => lsp_types::SymbolKind::ENUM_MEMBER,
5252
SymbolKind::Trait => lsp_types::SymbolKind::INTERFACE,
5353
SymbolKind::Macro | SymbolKind::BuiltinAttr => lsp_types::SymbolKind::FUNCTION,
54-
SymbolKind::Module | SymbolKind::Tool => lsp_types::SymbolKind::MODULE,
54+
SymbolKind::Module | SymbolKind::ToolModule => lsp_types::SymbolKind::MODULE,
5555
SymbolKind::TypeAlias | SymbolKind::TypeParam => lsp_types::SymbolKind::TYPE_PARAMETER,
5656
SymbolKind::Field => lsp_types::SymbolKind::FIELD,
5757
SymbolKind::Static => lsp_types::SymbolKind::CONSTANT,
@@ -129,7 +129,7 @@ pub(crate) fn completion_item_kind(
129129
SymbolKind::ValueParam => lsp_types::CompletionItemKind::VALUE,
130130
SymbolKind::Variant => lsp_types::CompletionItemKind::ENUM_MEMBER,
131131
SymbolKind::BuiltinAttr => lsp_types::CompletionItemKind::FUNCTION,
132-
SymbolKind::Tool => lsp_types::CompletionItemKind::MODULE,
132+
SymbolKind::ToolModule => lsp_types::CompletionItemKind::MODULE,
133133
},
134134
}
135135
}
@@ -502,7 +502,7 @@ fn semantic_token_type_and_modifiers(
502502
SymbolKind::Trait => lsp_types::SemanticTokenType::INTERFACE,
503503
SymbolKind::Macro => lsp_types::SemanticTokenType::MACRO,
504504
SymbolKind::BuiltinAttr => semantic_tokens::BUILTIN_ATTRIBUTE,
505-
SymbolKind::Tool => semantic_tokens::TOOL,
505+
SymbolKind::ToolModule => semantic_tokens::TOOL_MODULE,
506506
},
507507
HlTag::Attribute => semantic_tokens::ATTRIBUTE,
508508
HlTag::BoolLiteral => semantic_tokens::BOOLEAN,

0 commit comments

Comments
 (0)