Skip to content

Commit

Permalink
rustdoc: Box default fields of GenericParamDefKind
Browse files Browse the repository at this point in the history
This reduces the size of `GenericParamDef` a bit, but some of the size
savings are hidden because of the `ty` field of the `Const` variant.
I will box that in the next commit.
  • Loading branch information
camelid committed Oct 18, 2021
1 parent 9e60288 commit 9b52a63
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/librustdoc/clean/mod.rs
Expand Up @@ -421,7 +421,7 @@ impl Clean<GenericParamDef> for ty::GenericParamDef {
GenericParamDefKind::Type {
did: self.def_id,
bounds: vec![], // These are filled in from the where-clauses.
default,
default: default.map(Box::new),
synthetic,
},
)
Expand All @@ -432,7 +432,7 @@ impl Clean<GenericParamDef> for ty::GenericParamDef {
did: self.def_id,
ty: cx.tcx.type_of(self.def_id).clean(cx),
default: match has_default {
true => Some(cx.tcx.const_param_default(self.def_id).to_string()),
true => Some(Box::new(cx.tcx.const_param_default(self.def_id).to_string())),
false => None,
},
},
Expand Down Expand Up @@ -462,7 +462,7 @@ impl Clean<GenericParamDef> for hir::GenericParam<'_> {
GenericParamDefKind::Type {
did: cx.tcx.hir().local_def_id(self.hir_id).to_def_id(),
bounds: self.bounds.clean(cx),
default: default.clean(cx),
default: default.clean(cx).map(Box::new),
synthetic,
},
),
Expand All @@ -473,7 +473,7 @@ impl Clean<GenericParamDef> for hir::GenericParam<'_> {
ty: ty.clean(cx),
default: default.map(|ct| {
let def_id = cx.tcx.hir().local_def_id(ct.hir_id);
ty::Const::from_anon_const(cx.tcx, def_id).to_string()
Box::new(ty::Const::from_anon_const(cx.tcx, def_id).to_string())
}),
},
),
Expand Down
8 changes: 4 additions & 4 deletions src/librustdoc/clean/types.rs
Expand Up @@ -1219,13 +1219,13 @@ crate enum GenericParamDefKind {
Type {
did: DefId,
bounds: Vec<GenericBound>,
default: Option<Type>,
default: Option<Box<Type>>,
synthetic: Option<hir::SyntheticTyParamKind>,
},
Const {
did: DefId,
ty: Type,
default: Option<String>,
default: Option<Box<String>>,
},
}

Expand All @@ -1239,7 +1239,7 @@ impl GenericParamDefKind {
// any embedded types, but `get_type` seems to be the wrong name for that.
crate fn get_type(&self) -> Option<Type> {
match self {
GenericParamDefKind::Type { default, .. } => default.clone(),
GenericParamDefKind::Type { default, .. } => default.as_deref().cloned(),
GenericParamDefKind::Const { ty, .. } => Some(ty.clone()),
GenericParamDefKind::Lifetime { .. } => None,
}
Expand All @@ -1254,7 +1254,7 @@ crate struct GenericParamDef {

// `GenericParamDef` is used in many places. Make sure it doesn't unintentionally get bigger.
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(GenericParamDef, 120);
rustc_data_structures::static_assert_size!(GenericParamDef, 104);

impl GenericParamDef {
crate fn is_synthetic_type_param(&self) -> bool {
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/json/conversions.rs
Expand Up @@ -330,10 +330,10 @@ impl FromWithTcx<clean::GenericParamDefKind> for GenericParamDefKind {
},
Type { did: _, bounds, default, synthetic: _ } => GenericParamDefKind::Type {
bounds: bounds.into_iter().map(|x| x.into_tcx(tcx)).collect(),
default: default.map(|x| x.into_tcx(tcx)),
default: default.map(|x| (*x).into_tcx(tcx)),
},
Const { did: _, ty, default } => {
GenericParamDefKind::Const { ty: ty.into_tcx(tcx), default }
GenericParamDefKind::Const { ty: ty.into_tcx(tcx), default: default.map(|x| *x) }
}
}
}
Expand Down

0 comments on commit 9b52a63

Please sign in to comment.