]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #86887 - jyn514:cleanup-clean, r=CraftSpider
authorYuki Okushi <jtitor@2k36.org>
Mon, 12 Jul 2021 23:54:31 +0000 (08:54 +0900)
committerGitHub <noreply@github.com>
Mon, 12 Jul 2021 23:54:31 +0000 (08:54 +0900)
rustdoc: remove dead code in `clean`

Builds on https://github.com/rust-lang/rust/pull/86886 and should not be merged before.

1  2 
src/librustdoc/clean/blanket_impl.rs
src/librustdoc/clean/mod.rs

index c257d362694feffdb4d225a591fa0f7c1c5f702c,dc60b5a1d58e1624604c15079a20d7354be46b4b..8f74a48547d8833c0f88a12e6ec8ac111cda1af4
@@@ -96,9 -96,9 +96,9 @@@ impl<'a, 'tcx> BlanketImplFinder<'a, 't
                      name: None,
                      attrs: Default::default(),
                      visibility: Inherited,
 -                    def_id: FakeDefId::new_fake(item_def_id.krate),
 +                    def_id: ItemId::Blanket { impl_id: impl_def_id, for_: item_def_id },
                      kind: box ImplItem(Impl {
-                         span: self.cx.tcx.def_span(impl_def_id).clean(self.cx),
+                         span: Span::from_rustc_span(self.cx.tcx.def_span(impl_def_id)),
                          unsafety: hir::Unsafety::Normal,
                          generics: (
                              self.cx.tcx.generics_of(impl_def_id),
Simple merge