diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-11-17 16:13:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 16:13:58 +0100 |
| commit | ca38bd4230c80651348eda0964d92ea379c4e1a7 (patch) | |
| tree | 412acb02460485ffb8ff77f37706d454b3ee25dc | |
| parent | 3d63f25edfc39efc6461aa62803a5160af397edd (diff) | |
| parent | 5903163893ab6560c3f2bf961bfe261c05248ba7 (diff) | |
| download | rust-ca38bd4230c80651348eda0964d92ea379c4e1a7.tar.gz rust-ca38bd4230c80651348eda0964d92ea379c4e1a7.zip | |
Rollup merge of #79126 - jyn514:auto, r=GuillaumeGomez
Remove duplicate `Trait::auto` field It was exactly the same as `is_auto`. I found this while working on #78082, but it's not required for that PR. r? `@GuillaumeGomez`
| -rw-r--r-- | src/librustdoc/clean/inline.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/clean/types.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 6 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index d6f8870c859..7a4ec779070 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -193,7 +193,6 @@ crate fn build_external_trait(cx: &DocContext<'_>, did: DefId) -> clean::Trait { let trait_items = cx.tcx.associated_items(did).in_definition_order().map(|item| item.clean(cx)).collect(); - let auto_trait = cx.tcx.trait_def(did).has_auto_impl; let predicates = cx.tcx.predicates_of(did); let generics = (cx.tcx.generics_of(did), predicates).clean(cx); let generics = filter_non_trait_generics(did, generics); @@ -201,7 +200,6 @@ crate fn build_external_trait(cx: &DocContext<'_>, did: DefId) -> clean::Trait { let is_spotlight = load_attrs(cx, did).clean(cx).has_doc_flag(sym::spotlight); let is_auto = cx.tcx.trait_is_auto(did); clean::Trait { - auto: auto_trait, unsafety: cx.tcx.trait_def(did).unsafety, generics, items: trait_items, diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index b9e5a7a7297..95a0d335c4f 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1022,7 +1022,6 @@ impl Clean<Item> for doctree::Trait<'_> { stability: cx.stability(self.id), deprecation: cx.deprecation(self.id).clean(cx), kind: TraitItem(Trait { - auto: self.is_auto.clean(cx), unsafety: self.unsafety, items: self.items.iter().map(|ti| ti.clean(cx)).collect(), generics: self.generics.clean(cx), diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index db9de768d19..a3677e3f517 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -1003,7 +1003,6 @@ impl GetDefId for FnRetTy { #[derive(Clone, Debug)] crate struct Trait { - crate auto: bool, crate unsafety: hir::Unsafety, crate items: Vec<Item>, crate generics: Generics, diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 7022cde459c..28f7a4d3162 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -2761,7 +2761,7 @@ fn item_trait(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Trait, } write_loading_content(w, "</div>"); - if t.auto { + if t.is_auto { write_small_section_header( w, "synthetic-implementors", @@ -2792,7 +2792,7 @@ fn item_trait(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Trait, ); write_loading_content(w, "</div>"); - if t.auto { + if t.is_auto { write_small_section_header( w, "synthetic-implementors", @@ -4457,7 +4457,7 @@ fn sidebar_trait(buf: &mut Buffer, it: &clean::Item, t: &clean::Trait) { sidebar.push_str(&sidebar_assoc_items(it)); sidebar.push_str("<a class=\"sidebar-title\" href=\"#implementors\">Implementors</a>"); - if t.auto { + if t.is_auto { sidebar.push_str( "<a class=\"sidebar-title\" \ href=\"#synthetic-implementors\">Auto Implementors</a>", |
