diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 9eb7672daf..d8ccfde0cf 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1984,7 +1984,7 @@ impl Type { None } - pub fn type_parameters(&self) -> impl Iterator + '_ { + pub fn type_arguments(&self) -> impl Iterator + '_ { self.ty .strip_references() .as_adt() diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 3eb9e27eef..f76715d84f 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs @@ -304,11 +304,11 @@ fn module_def_doctest(sema: &Semantics, def: hir::ModuleDef) -> Op let name = adt.name(sema.db); let idx = path.rfind(':').map_or(0, |idx| idx + 1); let (prefix, suffix) = path.split_at(idx); - let mut ty_params = ty.type_parameters().peekable(); - let params = if ty_params.peek().is_some() { + let mut ty_args = ty.type_arguments().peekable(); + let params = if ty_args.peek().is_some() { format!( "<{}>", - ty_params.format_with(", ", |ty, cb| cb(&ty.display(sema.db))) + ty_args.format_with(", ", |ty, cb| cb(&ty.display(sema.db))) ) } else { String::new() diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs index 5f80a40c8a..b30652a9de 100644 --- a/crates/ide_assists/src/handlers/extract_function.rs +++ b/crates/ide_assists/src/handlers/extract_function.rs @@ -1183,7 +1183,7 @@ fn make_ret_ty(ctx: &AssistContext, module: hir::Module, fun: &Function) -> Opti } FlowHandler::Try { kind: TryKind::Result { ty: parent_ret_ty } } => { let handler_ty = parent_ret_ty - .type_parameters() + .type_arguments() .nth(1) .map(|ty| make_ty(&ty, ctx, module)) .unwrap_or_else(make::ty_unit); diff --git a/crates/ide_assists/src/utils/suggest_name.rs b/crates/ide_assists/src/utils/suggest_name.rs index 533624c1fd..deafcd630e 100644 --- a/crates/ide_assists/src/utils/suggest_name.rs +++ b/crates/ide_assists/src/utils/suggest_name.rs @@ -227,7 +227,7 @@ fn name_of_type(ty: &hir::Type, db: &RootDatabase) -> Option { let name = adt.name(db).to_string(); if WRAPPER_TYPES.contains(&name.as_str()) { - let inner_ty = ty.type_parameters().next()?; + let inner_ty = ty.type_arguments().next()?; return name_of_type(&inner_ty, db); }