Skip to content

Commit ca38bd4

Browse files
authored
Rollup merge of rust-lang#79126 - jyn514:auto, r=GuillaumeGomez
Remove duplicate `Trait::auto` field It was exactly the same as `is_auto`. I found this while working on rust-lang#78082, but it's not required for that PR. r? `@GuillaumeGomez`
2 parents 3d63f25 + 5903163 commit ca38bd4

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

src/librustdoc/clean/inline.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,13 @@ crate fn build_external_trait(cx: &DocContext<'_>, did: DefId) -> clean::Trait {
193193
let trait_items =
194194
cx.tcx.associated_items(did).in_definition_order().map(|item| item.clean(cx)).collect();
195195

196-
let auto_trait = cx.tcx.trait_def(did).has_auto_impl;
197196
let predicates = cx.tcx.predicates_of(did);
198197
let generics = (cx.tcx.generics_of(did), predicates).clean(cx);
199198
let generics = filter_non_trait_generics(did, generics);
200199
let (generics, supertrait_bounds) = separate_supertrait_bounds(generics);
201200
let is_spotlight = load_attrs(cx, did).clean(cx).has_doc_flag(sym::spotlight);
202201
let is_auto = cx.tcx.trait_is_auto(did);
203202
clean::Trait {
204-
auto: auto_trait,
205203
unsafety: cx.tcx.trait_def(did).unsafety,
206204
generics,
207205
items: trait_items,

src/librustdoc/clean/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,6 @@ impl Clean<Item> for doctree::Trait<'_> {
10221022
stability: cx.stability(self.id),
10231023
deprecation: cx.deprecation(self.id).clean(cx),
10241024
kind: TraitItem(Trait {
1025-
auto: self.is_auto.clean(cx),
10261025
unsafety: self.unsafety,
10271026
items: self.items.iter().map(|ti| ti.clean(cx)).collect(),
10281027
generics: self.generics.clean(cx),

src/librustdoc/clean/types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,6 @@ impl GetDefId for FnRetTy {
10031003

10041004
#[derive(Clone, Debug)]
10051005
crate struct Trait {
1006-
crate auto: bool,
10071006
crate unsafety: hir::Unsafety,
10081007
crate items: Vec<Item>,
10091008
crate generics: Generics,

src/librustdoc/html/render/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,7 +2761,7 @@ fn item_trait(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Trait,
27612761
}
27622762
write_loading_content(w, "</div>");
27632763

2764-
if t.auto {
2764+
if t.is_auto {
27652765
write_small_section_header(
27662766
w,
27672767
"synthetic-implementors",
@@ -2792,7 +2792,7 @@ fn item_trait(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Trait,
27922792
);
27932793
write_loading_content(w, "</div>");
27942794

2795-
if t.auto {
2795+
if t.is_auto {
27962796
write_small_section_header(
27972797
w,
27982798
"synthetic-implementors",
@@ -4457,7 +4457,7 @@ fn sidebar_trait(buf: &mut Buffer, it: &clean::Item, t: &clean::Trait) {
44574457
sidebar.push_str(&sidebar_assoc_items(it));
44584458

44594459
sidebar.push_str("<a class=\"sidebar-title\" href=\"#implementors\">Implementors</a>");
4460-
if t.auto {
4460+
if t.is_auto {
44614461
sidebar.push_str(
44624462
"<a class=\"sidebar-title\" \
44634463
href=\"#synthetic-implementors\">Auto Implementors</a>",

0 commit comments

Comments
 (0)