Skip to content

Commit 4facc1c

Browse files
author
Lukas Markeffsky
committed
rm higher-ranked lifetimes from DocVisitor
This allows the visitor to borrow from the visitees.
1 parent b1745c3 commit 4facc1c

8 files changed

+15
-15
lines changed

src/librustdoc/html/render/write_shared.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ struct AliasedTypeImpl<'cache> {
865865
type_aliases: Vec<(&'cache [Symbol], Item)>,
866866
}
867867

868-
impl<'cx, 'cache> DocVisitor for TypeImplCollector<'cx, 'cache> {
868+
impl<'cx, 'cache> DocVisitor<'_> for TypeImplCollector<'cx, 'cache> {
869869
fn visit_item(&mut self, it: &Item) {
870870
self.visit_item_recur(it);
871871
let cache = self.cache;

src/librustdoc/html/sources.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl LocalSourcesCollector<'_, '_> {
103103
}
104104
}
105105

106-
impl DocVisitor for LocalSourcesCollector<'_, '_> {
106+
impl DocVisitor<'_> for LocalSourcesCollector<'_, '_> {
107107
fn visit_item(&mut self, item: &clean::Item) {
108108
self.add_local_source(item);
109109

@@ -122,7 +122,7 @@ struct SourceCollector<'a, 'tcx> {
122122
crate_name: &'a str,
123123
}
124124

125-
impl DocVisitor for SourceCollector<'_, '_> {
125+
impl DocVisitor<'_> for SourceCollector<'_, '_> {
126126
fn visit_item(&mut self, item: &clean::Item) {
127127
if !self.cx.include_sources {
128128
return;

src/librustdoc/passes/calculate_doc_coverage.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl<'a, 'b> CoverageCalculator<'a, 'b> {
187187
}
188188
}
189189

190-
impl<'a, 'b> DocVisitor for CoverageCalculator<'a, 'b> {
190+
impl<'a, 'b> DocVisitor<'_> for CoverageCalculator<'a, 'b> {
191191
fn visit_item(&mut self, i: &clean::Item) {
192192
if !i.item_id.is_local() {
193193
// non-local items are skipped because they can be out of the users control,

src/librustdoc/passes/check_doc_test_visibility.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub(crate) fn check_doc_test_visibility(krate: Crate, cx: &mut DocContext<'_>) -
3434
krate
3535
}
3636

37-
impl<'a, 'tcx> DocVisitor for DocTestVisibilityLinter<'a, 'tcx> {
37+
impl<'a, 'tcx> DocVisitor<'_> for DocTestVisibilityLinter<'a, 'tcx> {
3838
fn visit_item(&mut self, item: &Item) {
3939
look_for_tests(self.cx, &item.doc_value(), item);
4040

src/librustdoc/passes/collect_intra_doc_links.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ fn is_derive_trait_collision<T>(ns: &PerNS<Result<Vec<(Res, T)>, ResolutionFailu
816816
}
817817
}
818818

819-
impl<'a, 'tcx> DocVisitor for LinkCollector<'a, 'tcx> {
819+
impl<'a, 'tcx> DocVisitor<'_> for LinkCollector<'a, 'tcx> {
820820
fn visit_item(&mut self, item: &Item) {
821821
self.resolve_links(item);
822822
self.visit_item_recur(item)

src/librustdoc/passes/collect_trait_impls.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ struct SyntheticImplCollector<'a, 'tcx> {
229229
impls: Vec<Item>,
230230
}
231231

232-
impl<'a, 'tcx> DocVisitor for SyntheticImplCollector<'a, 'tcx> {
232+
impl<'a, 'tcx> DocVisitor<'_> for SyntheticImplCollector<'a, 'tcx> {
233233
fn visit_item(&mut self, i: &Item) {
234234
if i.is_struct() || i.is_enum() || i.is_union() {
235235
// FIXME(eddyb) is this `doc(hidden)` check needed?
@@ -256,7 +256,7 @@ impl<'cache> ItemAndAliasCollector<'cache> {
256256
}
257257
}
258258

259-
impl<'cache> DocVisitor for ItemAndAliasCollector<'cache> {
259+
impl<'cache> DocVisitor<'_> for ItemAndAliasCollector<'cache> {
260260
fn visit_item(&mut self, i: &Item) {
261261
self.items.insert(i.item_id);
262262

src/librustdoc/passes/lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub(crate) fn run_lints(krate: Crate, cx: &mut DocContext<'_>) -> Crate {
2525
krate
2626
}
2727

28-
impl<'a, 'tcx> DocVisitor for Linter<'a, 'tcx> {
28+
impl<'a, 'tcx> DocVisitor<'_> for Linter<'a, 'tcx> {
2929
fn visit_item(&mut self, item: &Item) {
3030
let Some(hir_id) = DocContext::as_local_hir_id(self.cx.tcx, item.item_id) else {
3131
// If non-local, no need to check anything.

src/librustdoc/visit.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::clean::*;
22

3-
pub(crate) trait DocVisitor: Sized {
4-
fn visit_item(&mut self, item: &Item) {
3+
pub(crate) trait DocVisitor<'a>: Sized {
4+
fn visit_item(&mut self, item: &'a Item) {
55
self.visit_item_recur(item)
66
}
77

88
/// don't override!
9-
fn visit_inner_recur(&mut self, kind: &ItemKind) {
9+
fn visit_inner_recur(&mut self, kind: &'a ItemKind) {
1010
match kind {
1111
StrippedItem(..) => unreachable!(),
1212
ModuleItem(i) => {
@@ -47,18 +47,18 @@ pub(crate) trait DocVisitor: Sized {
4747
}
4848

4949
/// don't override!
50-
fn visit_item_recur(&mut self, item: &Item) {
50+
fn visit_item_recur(&mut self, item: &'a Item) {
5151
match &item.kind {
5252
StrippedItem(i) => self.visit_inner_recur(&*i),
5353
_ => self.visit_inner_recur(&item.kind),
5454
}
5555
}
5656

57-
fn visit_mod(&mut self, m: &Module) {
57+
fn visit_mod(&mut self, m: &'a Module) {
5858
m.items.iter().for_each(|i| self.visit_item(i))
5959
}
6060

61-
fn visit_crate(&mut self, c: &Crate) {
61+
fn visit_crate(&mut self, c: &'a Crate) {
6262
self.visit_item(&c.module);
6363

6464
for trait_ in c.external_traits.values() {

0 commit comments

Comments
 (0)