Skip to content

Commit b5817fa

Browse files
committed
rustdoc: Remove top-level wrappers for ImplKind methods
The `ImplKind` methods can just be used directly instead.
1 parent 7c7bf45 commit b5817fa

File tree

6 files changed

+8
-20
lines changed

6 files changed

+8
-20
lines changed

src/librustdoc/clean/types.rs

-12
Original file line numberDiff line numberDiff line change
@@ -2182,18 +2182,6 @@ crate struct Impl {
21822182
}
21832183

21842184
impl Impl {
2185-
crate fn is_auto_impl(&self) -> bool {
2186-
self.kind.is_auto()
2187-
}
2188-
2189-
crate fn is_blanket_impl(&self) -> bool {
2190-
self.kind.is_blanket()
2191-
}
2192-
2193-
crate fn blanket_impl_ty(&self) -> Option<&Type> {
2194-
self.kind.as_blanket_ty()
2195-
}
2196-
21972185
crate fn provided_trait_methods(&self, tcx: TyCtxt<'_>) -> FxHashSet<Symbol> {
21982186
self.trait_
21992187
.as_ref()

src/librustdoc/formats/cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ impl<'a, 'tcx> DocFolder for CacheBuilder<'a, 'tcx> {
228228
// Collect all the implementors of traits.
229229
if let clean::ImplItem(ref i) = *item.kind {
230230
if let Some(trait_) = &i.trait_ {
231-
if !i.is_blanket_impl() {
231+
if !i.kind.is_blanket() {
232232
self.cache
233233
.implementors
234234
.entry(trait_.def_id())

src/librustdoc/html/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ impl clean::Impl {
999999
write!(f, " for ")?;
10001000
}
10011001

1002-
if let Some(ref ty) = self.blanket_impl_ty() {
1002+
if let Some(ref ty) = self.kind.as_blanket_ty() {
10031003
fmt_type(ty, f, use_absolute, cx)?;
10041004
} else {
10051005
fmt_type(&self.for_, f, use_absolute, cx)?;

src/librustdoc/html/render/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,9 @@ fn render_assoc_items_inner(
11481148
}
11491149

11501150
let (synthetic, concrete): (Vec<&&Impl>, Vec<&&Impl>) =
1151-
traits.iter().partition(|t| t.inner_impl().is_auto_impl());
1151+
traits.iter().partition(|t| t.inner_impl().kind.is_auto());
11521152
let (blanket_impl, concrete): (Vec<&&Impl>, _) =
1153-
concrete.into_iter().partition(|t| t.inner_impl().is_blanket_impl());
1153+
concrete.into_iter().partition(|t| t.inner_impl().kind.is_blanket());
11541154

11551155
let mut impls = Buffer::empty_from(w);
11561156
render_impls(cx, &mut impls, &concrete, containing_item);
@@ -2059,9 +2059,9 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
20592059
};
20602060

20612061
let (synthetic, concrete): (Vec<&Impl>, Vec<&Impl>) =
2062-
v.iter().partition::<Vec<_>, _>(|i| i.inner_impl().is_auto_impl());
2062+
v.iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_auto());
20632063
let (blanket_impl, concrete): (Vec<&Impl>, Vec<&Impl>) =
2064-
concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().is_blanket_impl());
2064+
concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_blanket());
20652065

20662066
let concrete_format = format_impls(concrete);
20672067
let synthetic_format = format_impls(synthetic);

src/librustdoc/html/render/print_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
746746
});
747747

748748
let (mut synthetic, mut concrete): (Vec<&&Impl>, Vec<&&Impl>) =
749-
local.iter().partition(|i| i.inner_impl().is_auto_impl());
749+
local.iter().partition(|i| i.inner_impl().kind.is_auto());
750750

751751
synthetic.sort_by(|a, b| compare_impl(a, b, cx));
752752
concrete.sort_by(|a, b| compare_impl(a, b, cx));

src/librustdoc/html/render/write_shared.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ pub(super) fn write_shared(
585585
} else {
586586
Some(Implementor {
587587
text: imp.inner_impl().print(false, cx).to_string(),
588-
synthetic: imp.inner_impl().is_auto_impl(),
588+
synthetic: imp.inner_impl().kind.is_auto(),
589589
types: collect_paths_for_type(imp.inner_impl().for_.clone(), cache),
590590
})
591591
}

0 commit comments

Comments
 (0)