Rustdoc: use ThinVec for GenericArgs bindings
This commit is contained in:
parent
e91ad5fc62
commit
3d8d3f1435
4 changed files with 18 additions and 12 deletions
|
|
@ -5,6 +5,7 @@ use std::sync::Arc;
|
|||
|
||||
use rustc_ast as ast;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::thin_vec::ThinVec;
|
||||
use rustc_hir as hir;
|
||||
use rustc_hir::def::{DefKind, Res};
|
||||
use rustc_hir::def_id::DefId;
|
||||
|
|
@ -540,7 +541,7 @@ fn build_module(
|
|||
name: prim_ty.as_sym(),
|
||||
args: clean::GenericArgs::AngleBracketed {
|
||||
args: Vec::new(),
|
||||
bindings: Vec::new(),
|
||||
bindings: ThinVec::new(),
|
||||
},
|
||||
}],
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2051,14 +2051,14 @@ rustc_data_structures::static_assert_size!(GenericArg, 80);
|
|||
|
||||
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
|
||||
crate enum GenericArgs {
|
||||
AngleBracketed { args: Vec<GenericArg>, bindings: Vec<TypeBinding> },
|
||||
AngleBracketed { args: Vec<GenericArg>, bindings: ThinVec<TypeBinding> },
|
||||
Parenthesized { inputs: Vec<Type>, output: Option<Box<Type>> },
|
||||
}
|
||||
|
||||
// `GenericArgs` is in every `PathSegment`, so its size can significantly
|
||||
// affect rustdoc's memory usage.
|
||||
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(GenericArgs, 56);
|
||||
rustc_data_structures::static_assert_size!(GenericArgs, 40);
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
|
||||
crate struct PathSegment {
|
||||
|
|
@ -2069,7 +2069,7 @@ crate struct PathSegment {
|
|||
// `PathSegment` usually occurs multiple times in every `Path`, so its size can
|
||||
// significantly affect rustdoc's memory usage.
|
||||
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(PathSegment, 64);
|
||||
rustc_data_structures::static_assert_size!(PathSegment, 48);
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
crate struct Typedef {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ use crate::visit_lib::LibEmbargoVisitor;
|
|||
|
||||
use rustc_ast as ast;
|
||||
use rustc_ast::tokenstream::TokenTree;
|
||||
use rustc_data_structures::thin_vec::ThinVec;
|
||||
use rustc_hir as hir;
|
||||
use rustc_hir::def::{DefKind, Res};
|
||||
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
|
||||
|
|
@ -108,7 +109,7 @@ fn external_generic_args(
|
|||
if cx.tcx.fn_trait_kind_from_lang_item(did).is_some() {
|
||||
let inputs = match ty_kind.unwrap() {
|
||||
ty::Tuple(tys) => tys.iter().map(|t| t.expect_ty().clean(cx)).collect(),
|
||||
_ => return GenericArgs::AngleBracketed { args, bindings },
|
||||
_ => return GenericArgs::AngleBracketed { args, bindings: bindings.into() },
|
||||
};
|
||||
let output = None;
|
||||
// FIXME(#20299) return type comes from a projection now
|
||||
|
|
@ -118,7 +119,7 @@ fn external_generic_args(
|
|||
// };
|
||||
GenericArgs::Parenthesized { inputs, output }
|
||||
} else {
|
||||
GenericArgs::AngleBracketed { args, bindings }
|
||||
GenericArgs::AngleBracketed { args, bindings: bindings.into() }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +144,7 @@ pub(super) fn external_path(
|
|||
/// Remove the generic arguments from a path.
|
||||
crate fn strip_path_generics(mut path: Path) -> Path {
|
||||
for ps in path.segments.iter_mut() {
|
||||
ps.args = GenericArgs::AngleBracketed { args: vec![], bindings: vec![] }
|
||||
ps.args = GenericArgs::AngleBracketed { args: vec![], bindings: ThinVec::new() }
|
||||
}
|
||||
|
||||
path
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue