From afb77a959a45571ea6180053a63a25c752995380 Mon Sep 17 00:00:00 2001 From: Noah Lev Date: Mon, 27 Dec 2021 19:16:33 -0800 Subject: [PATCH] Coalesce two arguments as `&Function` --- src/librustdoc/html/render/search_index.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs index e03f96aeb47..90e73f4a76d 100644 --- a/src/librustdoc/html/render/search_index.rs +++ b/src/librustdoc/html/render/search_index.rs @@ -7,7 +7,7 @@ use rustc_span::symbol::Symbol; use serde::ser::{Serialize, SerializeStruct, Serializer}; use crate::clean; -use crate::clean::types::{FnDecl, FnRetTy, GenericBound, Generics, Type, WherePredicate}; +use crate::clean::types::{FnRetTy, Function, GenericBound, Generics, Type, WherePredicate}; use crate::formats::cache::Cache; use crate::formats::item_type::ItemType; use crate::html::markdown::short_markdown_summary; @@ -186,9 +186,9 @@ crate fn get_index_search_type<'tcx>( tcx: TyCtxt<'tcx>, ) -> Option { let (mut inputs, mut output) = match *item.kind { - clean::FunctionItem(ref f) => get_all_types(&f.generics, &f.decl, tcx), - clean::MethodItem(ref m, _) => get_all_types(&m.generics, &m.decl, tcx), - clean::TyMethodItem(ref m) => get_all_types(&m.generics, &m.decl, tcx), + clean::FunctionItem(ref f) => get_all_types(f, tcx), + clean::MethodItem(ref m, _) => get_all_types(m, tcx), + clean::TyMethodItem(ref m) => get_all_types(m, tcx), _ => return None, }; @@ -378,10 +378,12 @@ fn get_real_types<'tcx>( /// i.e. `fn foo>(x: u32, y: B)` will return /// `[u32, Display, Option]`. fn get_all_types<'tcx>( - generics: &Generics, - decl: &FnDecl, + func: &Function, tcx: TyCtxt<'tcx>, ) -> (Vec, Vec) { + let decl = &func.decl; + let generics = &func.generics; + let mut all_types = Vec::new(); for arg in decl.inputs.values.iter() { if arg.type_.is_self_type() {