Skip to content

Commit d556bb7

Browse files
borsbors
committed
Auto merge of #5321 - matthiaskrgr:rustup_31, r=phansch
rustup #68944 changelog: none
2 parents d8bcdac + ba0884b commit d556bb7

30 files changed

+58
-58
lines changed

Diff for: ‎clippy_lints/src/assign_ops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ExprVisitor<'a, 'tcx> {
256256

257257
walk_expr(self, expr);
258258
}
259-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
259+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
260260
NestedVisitorMap::None
261261
}
262262
}

Diff for: ‎clippy_lints/src/block_in_if_condition.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
6666
}
6767
walk_expr(self, expr);
6868
}
69-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
69+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
7070
NestedVisitorMap::None
7171
}
7272
}

Diff for: ‎clippy_lints/src/booleans.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ impl<'a, 'tcx> Visitor<'tcx> for NonminimalBoolVisitor<'a, 'tcx> {
457457
_ => walk_expr(self, e),
458458
}
459459
}
460-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
460+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
461461
NestedVisitorMap::None
462462
}
463463
}
@@ -491,7 +491,7 @@ impl<'a, 'tcx> Visitor<'tcx> for NotSimplificationVisitor<'a, 'tcx> {
491491

492492
walk_expr(self, expr);
493493
}
494-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
494+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
495495
NestedVisitorMap::None
496496
}
497497
}

Diff for: ‎clippy_lints/src/cognitive_complexity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl<'tcx> Visitor<'tcx> for CCHelper {
156156
_ => {},
157157
}
158158
}
159-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
159+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
160160
NestedVisitorMap::None
161161
}
162162
}

Diff for: ‎clippy_lints/src/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl_lint_pass!(DocMarkdown => [DOC_MARKDOWN, MISSING_SAFETY_DOC, MISSING_ERRORS
148148

149149
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DocMarkdown {
150150
fn check_crate(&mut self, cx: &LateContext<'a, 'tcx>, krate: &'tcx hir::Crate<'_>) {
151-
check_attrs(cx, &self.valid_idents, &krate.attrs);
151+
check_attrs(cx, &self.valid_idents, &krate.item.attrs);
152152
}
153153

154154
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item<'_>) {

Diff for: ‎clippy_lints/src/entry.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for InsertVisitor<'a, 'tcx, 'b> {
181181
walk_expr(self, expr);
182182
}
183183
}
184-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
184+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
185185
NestedVisitorMap::None
186186
}
187187
}

Diff for: ‎clippy_lints/src/escape.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BoxedLocal {
9292
}
9393

9494
// TODO: Replace with Map::is_argument(..) when it's fixed
95-
fn is_argument(map: &rustc::hir::map::Map<'_>, id: HirId) -> bool {
95+
fn is_argument(map: rustc::hir::map::Map<'_>, id: HirId) -> bool {
9696
match map.find(id) {
9797
Some(Node::Binding(_)) => (),
9898
_ => return false,
@@ -136,7 +136,7 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
136136
fn mutate(&mut self, cmt: &Place<'tcx>) {
137137
if cmt.projections.is_empty() {
138138
let map = &self.cx.tcx.hir();
139-
if is_argument(map, cmt.hir_id) {
139+
if is_argument(*map, cmt.hir_id) {
140140
// Skip closure arguments
141141
let parent_id = map.get_parent_node(cmt.hir_id);
142142
if let Some(Node::Expr(..)) = map.find(map.get_parent_node(parent_id)) {

Diff for: ‎clippy_lints/src/eval_order_dependence.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
158158
fn visit_block(&mut self, _: &'tcx Block<'_>) {
159159
// don't continue over blocks, LateLintPass already does that
160160
}
161-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
161+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
162162
NestedVisitorMap::None
163163
}
164164
}
@@ -341,7 +341,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ReadVisitor<'a, 'tcx> {
341341

342342
walk_expr(self, expr);
343343
}
344-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
344+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
345345
NestedVisitorMap::None
346346
}
347347
}

Diff for: ‎clippy_lints/src/fallible_impl_from.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_it
8585
intravisit::walk_expr(self, expr);
8686
}
8787

88-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
88+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
8989
NestedVisitorMap::None
9090
}
9191
}

Diff for: ‎clippy_lints/src/functions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for DerefVisitor<'a, 'tcx> {
561561
intravisit::walk_expr(self, expr);
562562
}
563563

564-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
564+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
565565
intravisit::NestedVisitorMap::None
566566
}
567567
}
@@ -624,7 +624,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for StaticMutVisitor<'a, 'tcx> {
624624
}
625625
}
626626

627-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
627+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
628628
intravisit::NestedVisitorMap::None
629629
}
630630
}

Diff for: ‎clippy_lints/src/let_if_seq.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for UsedVisitor<'a, 'tcx> {
158158
}
159159
intravisit::walk_expr(self, expr);
160160
}
161-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
161+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
162162
intravisit::NestedVisitorMap::None
163163
}
164164
}

Diff for: ‎clippy_lints/src/lifetimes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
407407
}
408408
walk_ty(self, ty);
409409
}
410-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
410+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
411411
NestedVisitorMap::None
412412
}
413413
}
@@ -479,7 +479,7 @@ impl<'tcx> Visitor<'tcx> for LifetimeChecker {
479479
walk_generic_param(self, param)
480480
}
481481
}
482-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
482+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
483483
NestedVisitorMap::None
484484
}
485485
}
@@ -522,7 +522,7 @@ impl<'tcx> Visitor<'tcx> for BodyLifetimeChecker {
522522
}
523523
}
524524

525-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
525+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
526526
NestedVisitorMap::None
527527
}
528528
}

Diff for: ‎clippy_lints/src/loops.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LocalUsedVisitor<'a, 'tcx> {
17121712
}
17131713
}
17141714

1715-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
1715+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
17161716
NestedVisitorMap::None
17171717
}
17181718
}
@@ -1885,7 +1885,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarVisitor<'a, 'tcx> {
18851885
}
18861886
self.prefer_mutable = old;
18871887
}
1888-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
1888+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
18891889
NestedVisitorMap::None
18901890
}
18911891
}
@@ -1942,7 +1942,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarUsedAfterLoopVisitor<'a, 'tcx> {
19421942
}
19431943
walk_expr(self, expr);
19441944
}
1945-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
1945+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
19461946
NestedVisitorMap::None
19471947
}
19481948
}
@@ -2084,7 +2084,7 @@ impl<'a, 'tcx> Visitor<'tcx> for IncrementVisitor<'a, 'tcx> {
20842084
}
20852085
walk_expr(self, expr);
20862086
}
2087-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2087+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
20882088
NestedVisitorMap::None
20892089
}
20902090
}
@@ -2176,8 +2176,8 @@ impl<'a, 'tcx> Visitor<'tcx> for InitializeVisitor<'a, 'tcx> {
21762176
walk_expr(self, expr);
21772177
}
21782178

2179-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2180-
NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
2179+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
2180+
NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
21812181
}
21822182
}
21832183

@@ -2312,7 +2312,7 @@ impl<'tcx> Visitor<'tcx> for LoopNestVisitor {
23122312
walk_pat(self, pat)
23132313
}
23142314

2315-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2315+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
23162316
NestedVisitorMap::None
23172317
}
23182318
}
@@ -2398,7 +2398,7 @@ impl<'a, 'tcx> Visitor<'tcx> for HasBreakOrReturnVisitor {
23982398
walk_expr(self, expr);
23992399
}
24002400

2401-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2401+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
24022402
NestedVisitorMap::None
24032403
}
24042404
}
@@ -2449,7 +2449,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarCollectorVisitor<'a, 'tcx> {
24492449
}
24502450
}
24512451

2452-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2452+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
24532453
NestedVisitorMap::None
24542454
}
24552455
}

Diff for: ‎clippy_lints/src/methods/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ fn lint_or_fun_call<'a, 'tcx>(
15451545
}
15461546
}
15471547

1548-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
1548+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
15491549
intravisit::NestedVisitorMap::None
15501550
}
15511551
}
@@ -3453,7 +3453,7 @@ fn contains_return(expr: &hir::Expr<'_>) -> bool {
34533453
}
34543454
}
34553455

3456-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
3456+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
34573457
intravisit::NestedVisitorMap::None
34583458
}
34593459
}

Diff for: ‎clippy_lints/src/methods/option_map_unwrap_or.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ impl<'a, 'tcx> Visitor<'tcx> for UnwrapVisitor<'a, 'tcx> {
9999
walk_path(self, path);
100100
}
101101

102-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
103-
NestedVisitorMap::All(&self.cx.tcx.hir())
102+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
103+
NestedVisitorMap::All(self.cx.tcx.hir())
104104
}
105105
}
106106

@@ -121,8 +121,8 @@ impl<'a, 'tcx> Visitor<'tcx> for MapExprVisitor<'a, 'tcx> {
121121
walk_path(self, path);
122122
}
123123

124-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
125-
NestedVisitorMap::All(&self.cx.tcx.hir())
124+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
125+
NestedVisitorMap::All(self.cx.tcx.hir())
126126
}
127127
}
128128

Diff for: ‎clippy_lints/src/methods/unnecessary_filter_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ReturnVisitor<'a, 'tcx> {
136136
}
137137
}
138138

139-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
139+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
140140
NestedVisitorMap::None
141141
}
142142
}

Diff for: ‎clippy_lints/src/missing_doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
125125
}
126126

127127
fn check_crate(&mut self, cx: &LateContext<'a, 'tcx>, krate: &'tcx hir::Crate<'_>) {
128-
self.check_missing_docs_attrs(cx, &krate.attrs, krate.span, "crate");
128+
self.check_missing_docs_attrs(cx, &krate.item.attrs, krate.item.span, "crate");
129129
}
130130

131131
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, it: &'tcx hir::Item<'_>) {

Diff for: ‎clippy_lints/src/mut_mut.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for MutVisitor<'a, 'tcx> {
108108

109109
intravisit::walk_ty(self, ty);
110110
}
111-
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
111+
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {
112112
intravisit::NestedVisitorMap::None
113113
}
114114
}

Diff for: ‎clippy_lints/src/mutable_debug_assertion.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> {
155155
walk_expr(self, expr)
156156
}
157157

158-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
159-
NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
158+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
159+
NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
160160
}
161161
}

Diff for: ‎clippy_lints/src/slow_vector_initialization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VectorInitializationVisitor<'a, 'tcx> {
318318
walk_expr(self, expr);
319319
}
320320

321-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
321+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
322322
NestedVisitorMap::None
323323
}
324324
}

Diff for: ‎clippy_lints/src/suspicious_trait_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BinaryExprVisitor {
197197

198198
walk_expr(self, expr);
199199
}
200-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
200+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
201201
NestedVisitorMap::None
202202
}
203203
}

Diff for: ‎clippy_lints/src/types.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ impl<'tcx> Visitor<'tcx> for TypeComplexityVisitor {
15541554
walk_ty(self, ty);
15551555
self.nest -= sub_nest;
15561556
}
1557-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
1557+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
15581558
NestedVisitorMap::None
15591559
}
15601560
}
@@ -2309,7 +2309,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ImplicitHasherTypeVisitor<'a, 'tcx> {
23092309
walk_ty(self, t);
23102310
}
23112311

2312-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2312+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
23132313
NestedVisitorMap::None
23142314
}
23152315
}
@@ -2386,8 +2386,8 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ImplicitHasherConstructorVisitor<'a, 'b, 't
23862386
walk_expr(self, e);
23872387
}
23882388

2389-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
2390-
NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
2389+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
2390+
NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
23912391
}
23922392
}
23932393

Diff for: ‎clippy_lints/src/unused_self.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<'a, 'tcx> Visitor<'tcx> for UnusedSelfVisitor<'a, 'tcx> {
107107
walk_path(self, path);
108108
}
109109

110-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
111-
NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
110+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
111+
NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
112112
}
113113
}

Diff for: ‎clippy_lints/src/unwrap.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ impl<'a, 'tcx> Visitor<'tcx> for UnwrappableVariablesVisitor<'a, 'tcx> {
185185
}
186186
}
187187

188-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
189-
NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
188+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
189+
NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
190190
}
191191
}
192192

Diff for: ‎clippy_lints/src/use_self.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TraitImplTyVisitor<'a, 'tcx> {
113113
walk_ty(self, t)
114114
}
115115

116-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
116+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
117117
NestedVisitorMap::None
118118
}
119119
}
@@ -275,7 +275,7 @@ impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> {
275275
}
276276
}
277277

278-
fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
279-
NestedVisitorMap::All(&self.cx.tcx.hir())
278+
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
279+
NestedVisitorMap::All(self.cx.tcx.hir())
280280
}
281281
}

0 commit comments

Comments
 (0)