diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2021-11-07 18:26:37 -0800 |
|---|---|---|
| committer | Noah Lev <camelidcamel@gmail.com> | 2021-11-07 18:26:37 -0800 |
| commit | b5817fada28cf21199ce4911b5cbde8bd1007c0d (patch) | |
| tree | 7afeda14023f99016f3b217a207f3ce10700dc0f | |
| parent | 7c7bf451eb986623d8fc4a8c4ab427393b3ab846 (diff) | |
| download | rust-b5817fada28cf21199ce4911b5cbde8bd1007c0d.tar.gz rust-b5817fada28cf21199ce4911b5cbde8bd1007c0d.zip | |
rustdoc: Remove top-level wrappers for `ImplKind` methods
The `ImplKind` methods can just be used directly instead.
| -rw-r--r-- | src/librustdoc/clean/types.rs | 12 | ||||
| -rw-r--r-- | src/librustdoc/formats/cache.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/format.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 8 | ||||
| -rw-r--r-- | src/librustdoc/html/render/print_item.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/render/write_shared.rs | 2 |
6 files changed, 8 insertions, 20 deletions
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index ee6cb292cbe..0dc1c24b16e 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -2182,18 +2182,6 @@ crate struct Impl { } impl Impl { - crate fn is_auto_impl(&self) -> bool { - self.kind.is_auto() - } - - crate fn is_blanket_impl(&self) -> bool { - self.kind.is_blanket() - } - - crate fn blanket_impl_ty(&self) -> Option<&Type> { - self.kind.as_blanket_ty() - } - crate fn provided_trait_methods(&self, tcx: TyCtxt<'_>) -> FxHashSet<Symbol> { self.trait_ .as_ref() diff --git a/src/librustdoc/formats/cache.rs b/src/librustdoc/formats/cache.rs index 2a3998f4f9d..a929cd094f8 100644 --- a/src/librustdoc/formats/cache.rs +++ b/src/librustdoc/formats/cache.rs @@ -228,7 +228,7 @@ impl<'a, 'tcx> DocFolder for CacheBuilder<'a, 'tcx> { // Collect all the implementors of traits. if let clean::ImplItem(ref i) = *item.kind { if let Some(trait_) = &i.trait_ { - if !i.is_blanket_impl() { + if !i.kind.is_blanket() { self.cache .implementors .entry(trait_.def_id()) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index a56fcfefb21..4f204913204 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -999,7 +999,7 @@ impl clean::Impl { write!(f, " for ")?; } - if let Some(ref ty) = self.blanket_impl_ty() { + if let Some(ref ty) = self.kind.as_blanket_ty() { fmt_type(ty, f, use_absolute, cx)?; } else { fmt_type(&self.for_, f, use_absolute, cx)?; diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 841943a7989..fdadc68998d 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1148,9 +1148,9 @@ fn render_assoc_items_inner( } let (synthetic, concrete): (Vec<&&Impl>, Vec<&&Impl>) = - traits.iter().partition(|t| t.inner_impl().is_auto_impl()); + traits.iter().partition(|t| t.inner_impl().kind.is_auto()); let (blanket_impl, concrete): (Vec<&&Impl>, _) = - concrete.into_iter().partition(|t| t.inner_impl().is_blanket_impl()); + concrete.into_iter().partition(|t| t.inner_impl().kind.is_blanket()); let mut impls = Buffer::empty_from(w); render_impls(cx, &mut impls, &concrete, containing_item); @@ -2059,9 +2059,9 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { }; let (synthetic, concrete): (Vec<&Impl>, Vec<&Impl>) = - v.iter().partition::<Vec<_>, _>(|i| i.inner_impl().is_auto_impl()); + v.iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_auto()); let (blanket_impl, concrete): (Vec<&Impl>, Vec<&Impl>) = - concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().is_blanket_impl()); + concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_blanket()); let concrete_format = format_impls(concrete); let synthetic_format = format_impls(synthetic); diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs index 10afe18b33c..7ef773fe5ff 100644 --- a/src/librustdoc/html/render/print_item.rs +++ b/src/librustdoc/html/render/print_item.rs @@ -746,7 +746,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra }); let (mut synthetic, mut concrete): (Vec<&&Impl>, Vec<&&Impl>) = - local.iter().partition(|i| i.inner_impl().is_auto_impl()); + local.iter().partition(|i| i.inner_impl().kind.is_auto()); synthetic.sort_by(|a, b| compare_impl(a, b, cx)); concrete.sort_by(|a, b| compare_impl(a, b, cx)); diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index cf12d668569..2d3b2490677 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -585,7 +585,7 @@ pub(super) fn write_shared( } else { Some(Implementor { text: imp.inner_impl().print(false, cx).to_string(), - synthetic: imp.inner_impl().is_auto_impl(), + synthetic: imp.inner_impl().kind.is_auto(), types: collect_paths_for_type(imp.inner_impl().for_.clone(), cache), }) } |
