diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2021-12-03 21:05:31 -0800 |
|---|---|---|
| committer | Noah Lev <camelidcamel@gmail.com> | 2021-12-03 21:05:31 -0800 |
| commit | 51ca2cc6affdfb32ba278a8f6c408a1149c053f7 (patch) | |
| tree | 9c066419e6e1ca51ad2b12d0c0e7c2c669757627 | |
| parent | a97f17535009acaa3891a8295b6534b1f022c472 (diff) | |
| download | rust-51ca2cc6affdfb32ba278a8f6c408a1149c053f7.tar.gz rust-51ca2cc6affdfb32ba278a8f6c408a1149c053f7.zip | |
Remove single-use `GenericParamDef::get_type` function
Rationale: * The name was confusing. * It was only used in one place. * That place didn't actually need all the functionality of `get_type`; rather, removing `get_type` makes that code clearer.
| -rw-r--r-- | src/librustdoc/clean/types.rs | 15 | ||||
| -rw-r--r-- | src/librustdoc/html/render/cache.rs | 26 |
2 files changed, 13 insertions, 28 deletions
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index de4c0354537..1fe4aa9023e 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -1244,17 +1244,6 @@ impl GenericParamDefKind { crate fn is_type(&self) -> bool { matches!(self, GenericParamDefKind::Type { .. }) } - - // FIXME(eddyb) this either returns the default of a type parameter, or the - // type of a `const` parameter. It seems that the intention is to *visit* - // 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.as_deref().cloned(), - GenericParamDefKind::Const { ty, .. } => Some((&**ty).clone()), - GenericParamDefKind::Lifetime { .. } => None, - } - } } #[derive(Clone, PartialEq, Eq, Debug, Hash)] @@ -1279,10 +1268,6 @@ impl GenericParamDef { self.kind.is_type() } - crate fn get_type(&self) -> Option<Type> { - self.kind.get_type() - } - crate fn get_bounds(&self) -> Option<&[GenericBound]> { match self.kind { GenericParamDefKind::Type { ref bounds, .. } => Some(bounds), diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs index d12667c9e5c..2f7214e958e 100644 --- a/src/librustdoc/html/render/cache.rs +++ b/src/librustdoc/html/render/cache.rs @@ -347,19 +347,19 @@ crate fn get_real_types<'tcx>( let bounds = where_pred.get_bounds().unwrap_or_else(|| &[]); for bound in bounds.iter() { if let GenericBound::TraitBound(poly_trait, _) = bound { - for x in poly_trait.generic_params.iter() { - if !x.is_type() { - continue; - } - if let Some(ty) = x.get_type() { - get_real_types( - generics, - &ty, - tcx, - recurse + 1, - &mut ty_generics, - cache, - ); + for param_def in poly_trait.generic_params.iter() { + match ¶m_def.kind { + clean::GenericParamDefKind::Type { default: Some(ty), .. } => { + get_real_types( + generics, + ty, + tcx, + recurse + 1, + &mut ty_generics, + cache, + ) + } + _ => {} } } } |
