Skip to content

Commit 1a01a5a

Browse files
committed
internal: fix naming polarity
Type Constructors have *parameters*, when they are substituted with type *arguments*, we have a type.
1 parent cb3ef55 commit 1a01a5a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

crates/hir/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ impl Type {
19841984
None
19851985
}
19861986

1987-
pub fn type_parameters(&self) -> impl Iterator<Item = Type> + '_ {
1987+
pub fn type_arguments(&self) -> impl Iterator<Item = Type> + '_ {
19881988
self.ty
19891989
.strip_references()
19901990
.as_adt()

crates/ide/src/runnables.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Op
304304
let name = adt.name(sema.db);
305305
let idx = path.rfind(':').map_or(0, |idx| idx + 1);
306306
let (prefix, suffix) = path.split_at(idx);
307-
let mut ty_params = ty.type_parameters().peekable();
308-
let params = if ty_params.peek().is_some() {
307+
let mut ty_args = ty.type_arguments().peekable();
308+
let params = if ty_args.peek().is_some() {
309309
format!(
310310
"<{}>",
311-
ty_params.format_with(", ", |ty, cb| cb(&ty.display(sema.db)))
311+
ty_args.format_with(", ", |ty, cb| cb(&ty.display(sema.db)))
312312
)
313313
} else {
314314
String::new()

crates/ide_assists/src/handlers/extract_function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ fn make_ret_ty(ctx: &AssistContext, module: hir::Module, fun: &Function) -> Opti
11831183
}
11841184
FlowHandler::Try { kind: TryKind::Result { ty: parent_ret_ty } } => {
11851185
let handler_ty = parent_ret_ty
1186-
.type_parameters()
1186+
.type_arguments()
11871187
.nth(1)
11881188
.map(|ty| make_ty(&ty, ctx, module))
11891189
.unwrap_or_else(make::ty_unit);

crates/ide_assists/src/utils/suggest_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ fn name_of_type(ty: &hir::Type, db: &RootDatabase) -> Option<String> {
227227
let name = adt.name(db).to_string();
228228

229229
if WRAPPER_TYPES.contains(&name.as_str()) {
230-
let inner_ty = ty.type_parameters().next()?;
230+
let inner_ty = ty.type_arguments().next()?;
231231
return name_of_type(&inner_ty, db);
232232
}
233233

0 commit comments

Comments
 (0)