Skip to content

Commit a3c77f6

Browse files
phanschphansch
authored
Merge pull request #3512 from matthiaskrgr/rustup
rustup #56502 ( .hir -> .hir() )
2 parents 26602dd + d93ea1e commit a3c77f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+182
-169
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ before_install:
3030
install:
3131
- |
3232
if [ -z ${INTEGRATION} ]; then
33-
rustup component add rustfmt-preview || cargo install --git https://github.com/rust-lang/rustfmt/ --force
33+
rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
3434
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
3535
. $HOME/.nvm/nvm.sh
3636
nvm install stable

‎clippy_lints/src/arithmetic.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
121121
}
122122

123123
fn check_body(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body) {
124-
let body_owner = cx.tcx.hir.body_owner(body.id());
124+
let body_owner = cx.tcx.hir().body_owner(body.id());
125125

126-
match cx.tcx.hir.body_owner_kind(body_owner) {
126+
match cx.tcx.hir().body_owner_kind(body_owner) {
127127
hir::BodyOwnerKind::Static(_) | hir::BodyOwnerKind::Const => {
128-
let body_span = cx.tcx.hir.span(body_owner);
128+
let body_span = cx.tcx.hir().span(body_owner);
129129

130130
if let Some(span) = self.const_span {
131131
if span.contains(body_span) {
@@ -139,8 +139,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
139139
}
140140

141141
fn check_body_post(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body) {
142-
let body_owner = cx.tcx.hir.body_owner(body.id());
143-
let body_span = cx.tcx.hir.span(body_owner);
142+
let body_owner = cx.tcx.hir().body_owner(body.id());
143+
let body_span = cx.tcx.hir().span(body_owner);
144144

145145
if let Some(span) = self.const_span {
146146
if span.contains(body_span) {

‎clippy_lints/src/assign_ops.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps {
144144
return; // useless if the trait doesn't exist
145145
};
146146
// check that we are not inside an `impl AssignOp` of this exact operation
147-
let parent_fn = cx.tcx.hir.get_parent(e.id);
148-
let parent_impl = cx.tcx.hir.get_parent(parent_fn);
147+
let parent_fn = cx.tcx.hir().get_parent(e.id);
148+
let parent_impl = cx.tcx.hir().get_parent(parent_fn);
149149
// the crate node is the only one that is not in the map
150150
if_chain! {
151151
if parent_impl != ast::CRATE_NODE_ID;
152-
if let hir::Node::Item(item) = cx.tcx.hir.get(parent_impl);
152+
if let hir::Node::Item(item) = cx.tcx.hir().get(parent_impl);
153153
if let hir::ItemKind::Impl(_, _, _, _, Some(ref trait_ref), _, _) =
154154
item.node;
155155
if trait_ref.path.def.def_id() == trait_id;

‎clippy_lints/src/attrs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,15 @@ fn check_clippy_lint_names(cx: &LateContext<'_, '_>, items: &[NestedMetaItem]) {
354354

355355
fn is_relevant_item(tcx: TyCtxt<'_, '_, '_>, item: &Item) -> bool {
356356
if let ItemKind::Fn(_, _, _, eid) = item.node {
357-
is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir.body(eid).value)
357+
is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir().body(eid).value)
358358
} else {
359359
true
360360
}
361361
}
362362

363363
fn is_relevant_impl(tcx: TyCtxt<'_, '_, '_>, item: &ImplItem) -> bool {
364364
match item.node {
365-
ImplItemKind::Method(_, eid) => is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir.body(eid).value),
365+
ImplItemKind::Method(_, eid) => is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir().body(eid).value),
366366
_ => false,
367367
}
368368
}
@@ -371,7 +371,7 @@ fn is_relevant_trait(tcx: TyCtxt<'_, '_, '_>, item: &TraitItem) -> bool {
371371
match item.node {
372372
TraitItemKind::Method(_, TraitMethod::Required(_)) => true,
373373
TraitItemKind::Method(_, TraitMethod::Provided(eid)) => {
374-
is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir.body(eid).value)
374+
is_relevant_expr(tcx, tcx.body_tables(eid), &tcx.hir().body(eid).value)
375375
},
376376
_ => false,
377377
}

‎clippy_lints/src/block_in_if_condition.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct ExVisitor<'a, 'tcx: 'a> {
6868
impl<'a, 'tcx: 'a> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
6969
fn visit_expr(&mut self, expr: &'tcx Expr) {
7070
if let ExprKind::Closure(_, _, eid, _, _) = expr.node {
71-
let body = self.cx.tcx.hir.body(eid);
71+
let body = self.cx.tcx.hir().body(eid);
7272
let ex = &body.value;
7373
if matches!(ex.node, ExprKind::Block(_, _)) && !in_macro(body.value.span) {
7474
self.found_block = Some(ex);

‎clippy_lints/src/bytecount.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ByteCount {
6060
if filter_args.len() == 2;
6161
if let ExprKind::Closure(_, _, body_id, _, _) = filter_args[1].node;
6262
then {
63-
let body = cx.tcx.hir.body(body_id);
63+
let body = cx.tcx.hir().body(body_id);
6464
if_chain! {
6565
if body.arguments.len() == 1;
6666
if let Some(argname) = get_pat_name(&body.arguments[0].pat);

‎clippy_lints/src/copy_iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl LintPass for CopyIterator {
4949
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for CopyIterator {
5050
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item) {
5151
if let ItemKind::Impl(_, _, _, _, Some(ref trait_ref), _, _) = item.node {
52-
let ty = cx.tcx.type_of(cx.tcx.hir.local_def_id(item.id));
52+
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.id));
5353

5454
if is_copy(cx, ty) && match_path(&trait_ref.path, &paths::ITERATOR) {
5555
span_note_and_lint(

‎clippy_lints/src/cyclomatic_complexity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for CyclomaticComplexity {
130130
span: Span,
131131
node_id: NodeId,
132132
) {
133-
let def_id = cx.tcx.hir.local_def_id(node_id);
133+
let def_id = cx.tcx.hir().local_def_id(node_id);
134134
if !cx.tcx.has_attr(def_id, "test") {
135135
self.check(cx, body, span);
136136
}

‎clippy_lints/src/derive.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl LintPass for Derive {
8282
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Derive {
8383
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item) {
8484
if let ItemKind::Impl(_, _, _, _, Some(ref trait_ref), _, _) = item.node {
85-
let ty = cx.tcx.type_of(cx.tcx.hir.local_def_id(item.id));
85+
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.id));
8686
let is_automatically_derived = is_automatically_derived(&*item.attrs);
8787

8888
check_hash_peq(cx, item.span, trait_ref, ty, is_automatically_derived);
@@ -129,9 +129,9 @@ fn check_hash_peq<'a, 'tcx>(
129129
cx, DERIVE_HASH_XOR_EQ, span,
130130
mess,
131131
|db| {
132-
if let Some(node_id) = cx.tcx.hir.as_local_node_id(impl_id) {
132+
if let Some(node_id) = cx.tcx.hir().as_local_node_id(impl_id) {
133133
db.span_note(
134-
cx.tcx.hir.span(node_id),
134+
cx.tcx.hir().span(node_id),
135135
"`PartialEq` implemented here"
136136
);
137137
}

‎clippy_lints/src/empty_enum.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl LintPass for EmptyEnum {
4343

4444
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EmptyEnum {
4545
fn check_item(&mut self, cx: &LateContext<'_, '_>, item: &Item) {
46-
let did = cx.tcx.hir.local_def_id(item.id);
46+
let did = cx.tcx.hir().local_def_id(item.id);
4747
if let ItemKind::Enum(..) = item.node {
4848
let ty = cx.tcx.type_of(did);
4949
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");

‎clippy_lints/src/enum_clike.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnportableVariant {
6262
let variant = &var.node;
6363
if let Some(ref anon_const) = variant.disr_expr {
6464
let param_env = ty::ParamEnv::empty();
65-
let def_id = cx.tcx.hir.body_owner_def_id(anon_const.body);
65+
let def_id = cx.tcx.hir().body_owner_def_id(anon_const.body);
6666
let substs = Substs::identity_for_item(cx.tcx.global_tcx(), def_id);
6767
let instance = ty::Instance::new(def_id, substs);
6868
let c_id = GlobalId {

‎clippy_lints/src/enum_glob_use.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EnumGlobUse {
4747
fn check_mod(&mut self, cx: &LateContext<'a, 'tcx>, m: &'tcx Mod, _: Span, _: NodeId) {
4848
// only check top level `use` statements
4949
for item in &m.item_ids {
50-
self.lint_item(cx, cx.tcx.hir.expect_item(item.id));
50+
self.lint_item(cx, cx.tcx.hir().expect_item(item.id));
5151
}
5252
}
5353
}

‎clippy_lints/src/escape.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
7474
node_id: NodeId,
7575
) {
7676
// If the method is an impl for a trait, don't warn
77-
let parent_id = cx.tcx.hir.get_parent(node_id);
78-
let parent_node = cx.tcx.hir.find(parent_id);
77+
let parent_id = cx.tcx.hir().get_parent(node_id);
78+
let parent_node = cx.tcx.hir().find(parent_id);
7979

8080
if let Some(Node::Item(item)) = parent_node {
8181
if let ItemKind::Impl(_, _, _, _, Some(..), _, _) = item.node {
@@ -89,15 +89,15 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
8989
too_large_for_stack: self.too_large_for_stack,
9090
};
9191

92-
let fn_def_id = cx.tcx.hir.local_def_id(node_id);
92+
let fn_def_id = cx.tcx.hir().local_def_id(node_id);
9393
let region_scope_tree = &cx.tcx.region_scope_tree(fn_def_id);
9494
ExprUseVisitor::new(&mut v, cx.tcx, cx.param_env, region_scope_tree, cx.tables, None).consume_body(body);
9595

9696
for node in v.set {
9797
span_lint(
9898
cx,
9999
BOXED_LOCAL,
100-
cx.tcx.hir.span(node),
100+
cx.tcx.hir().span(node),
101101
"local variable doesn't need to be boxed here",
102102
);
103103
}
@@ -115,7 +115,7 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
115115
}
116116
fn matched_pat(&mut self, _: &Pat, _: &cmt_<'tcx>, _: MatchMode) {}
117117
fn consume_pat(&mut self, consume_pat: &Pat, cmt: &cmt_<'tcx>, _: ConsumeMode) {
118-
let map = &self.cx.tcx.hir;
118+
let map = &self.cx.tcx.hir();
119119
if map.is_argument(consume_pat.id) {
120120
// Skip closure arguments
121121
if let Some(Node::Expr(..)) = map.find(map.get_parent_node(consume_pat.id)) {

‎clippy_lints/src/eta_reduction.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EtaPass {
6262

6363
fn check_closure(cx: &LateContext<'_, '_>, expr: &Expr) {
6464
if let ExprKind::Closure(_, ref decl, eid, _, _) = expr.node {
65-
let body = cx.tcx.hir.body(eid);
65+
let body = cx.tcx.hir().body(eid);
6666
let ex = &body.value;
6767
if let ExprKind::Call(ref caller, ref args) = ex.node {
6868
if args.len() != decl.inputs.len() {

‎clippy_lints/src/eval_order_dependence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
191191
///
192192
/// When such a read is found, the lint is triggered.
193193
fn check_for_unsequenced_reads(vis: &mut ReadVisitor<'_, '_>) {
194-
let map = &vis.cx.tcx.hir;
194+
let map = &vis.cx.tcx.hir();
195195
let mut cur_id = vis.write_expr.id;
196196
loop {
197197
let parent_id = map.get_parent_node(cur_id);

‎clippy_lints/src/fallible_impl_from.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl LintPass for FallibleImplFrom {
4848
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for FallibleImplFrom {
4949
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) {
5050
// check for `impl From<???> for ..`
51-
let impl_def_id = cx.tcx.hir.local_def_id(item.id);
51+
let impl_def_id = cx.tcx.hir().local_def_id(item.id);
5252
if_chain! {
5353
if let hir::ItemKind::Impl(.., ref impl_items) = item.node;
5454
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_def_id);
@@ -106,11 +106,11 @@ fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_it
106106
if_chain! {
107107
if impl_item.ident.name == "from";
108108
if let ImplItemKind::Method(_, body_id) =
109-
cx.tcx.hir.impl_item(impl_item.id).node;
109+
cx.tcx.hir().impl_item(impl_item.id).node;
110110
then {
111111
// check the body for `begin_panic` or `unwrap`
112-
let body = cx.tcx.hir.body(body_id);
113-
let impl_item_def_id = cx.tcx.hir.local_def_id(impl_item.id.node_id);
112+
let body = cx.tcx.hir().body(body_id);
113+
let impl_item_def_id = cx.tcx.hir().local_def_id(impl_item.id.node_id);
114114
let mut fpu = FindPanicUnwrap {
115115
tcx: cx.tcx,
116116
tables: cx.tcx.typeck_tables_of(impl_item_def_id),

‎clippy_lints/src/functions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {
9595
span: Span,
9696
nodeid: ast::NodeId,
9797
) {
98-
let is_impl = if let Some(hir::Node::Item(item)) = cx.tcx.hir.find(cx.tcx.hir.get_parent_node(nodeid)) {
98+
let is_impl = if let Some(hir::Node::Item(item)) = cx.tcx.hir().find(cx.tcx.hir().get_parent_node(nodeid)) {
9999
matches!(item.node, hir::ItemKind::Impl(_, _, _, _, Some(_), _, _))
100100
} else {
101101
false
@@ -138,7 +138,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {
138138
}
139139

140140
if let hir::TraitMethod::Provided(eid) = *eid {
141-
let body = cx.tcx.hir.body(eid);
141+
let body = cx.tcx.hir().body(eid);
142142
self.check_raw_ptr(cx, sig.header.unsafety, &sig.decl, body, item.id);
143143
}
144144
}

‎clippy_lints/src/implicit_return.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
119119
_: Span,
120120
_: NodeId,
121121
) {
122-
let def_id = cx.tcx.hir.body_owner_def_id(body.id());
122+
let def_id = cx.tcx.hir().body_owner_def_id(body.id());
123123
let mir = cx.tcx.optimized_mir(def_id);
124124

125125
// checking return type through MIR, HIR is not able to determine inferred closure return types

‎clippy_lints/src/infinite_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fn is_infinite(cx: &LateContext<'_, '_>, expr: &Expr) -> Finiteness {
165165
}
166166
if method.ident.name == "flat_map" && args.len() == 2 {
167167
if let ExprKind::Closure(_, _, body_id, _, _) = args[1].node {
168-
let body = cx.tcx.hir.body(body_id);
168+
let body = cx.tcx.hir().body(body_id);
169169
return is_infinite(cx, &body.value);
170170
}
171171
}

‎clippy_lints/src/large_enum_variant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl LintPass for LargeEnumVariant {
5959

6060
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LargeEnumVariant {
6161
fn check_item(&mut self, cx: &LateContext<'_, '_>, item: &Item) {
62-
let did = cx.tcx.hir.local_def_id(item.id);
62+
let did = cx.tcx.hir().local_def_id(item.id);
6363
if let ItemKind::Enum(ref def, _) = item.node {
6464
let ty = cx.tcx.type_of(did);
6565
let adt = ty.ty_adt_def().expect("already checked whether this is an enum");

‎clippy_lints/src/len_zero.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fn check_trait_items(cx: &LateContext<'_, '_>, visited_trait: &Item, trait_items
137137
item.ident.name == name
138138
&& if let AssociatedItemKind::Method { has_self } = item.kind {
139139
has_self && {
140-
let did = cx.tcx.hir.local_def_id(item.id.node_id);
140+
let did = cx.tcx.hir().local_def_id(item.id.node_id);
141141
cx.tcx.fn_sig(did).inputs().skip_binder().len() == 1
142142
}
143143
} else {
@@ -156,7 +156,7 @@ fn check_trait_items(cx: &LateContext<'_, '_>, visited_trait: &Item, trait_items
156156

157157
if cx.access_levels.is_exported(visited_trait.id) && trait_items.iter().any(|i| is_named_self(cx, i, "len")) {
158158
let mut current_and_super_traits = FxHashSet::default();
159-
let visited_trait_def_id = cx.tcx.hir.local_def_id(visited_trait.id);
159+
let visited_trait_def_id = cx.tcx.hir().local_def_id(visited_trait.id);
160160
fill_trait_set(visited_trait_def_id, &mut current_and_super_traits, cx);
161161

162162
let is_empty_method_found = current_and_super_traits
@@ -188,7 +188,7 @@ fn check_impl_items(cx: &LateContext<'_, '_>, item: &Item, impl_items: &[ImplIte
188188
item.ident.name == name
189189
&& if let AssociatedItemKind::Method { has_self } = item.kind {
190190
has_self && {
191-
let did = cx.tcx.hir.local_def_id(item.id.node_id);
191+
let did = cx.tcx.hir().local_def_id(item.id.node_id);
192192
cx.tcx.fn_sig(did).inputs().skip_binder().len() == 1
193193
}
194194
} else {
@@ -208,7 +208,7 @@ fn check_impl_items(cx: &LateContext<'_, '_>, item: &Item, impl_items: &[ImplIte
208208

209209
if let Some(i) = impl_items.iter().find(|i| is_named_self(cx, i, "len")) {
210210
if cx.access_levels.is_exported(i.id.node_id) {
211-
let def_id = cx.tcx.hir.local_def_id(item.id);
211+
let def_id = cx.tcx.hir().local_def_id(item.id);
212212
let ty = cx.tcx.type_of(def_id);
213213

214214
span_lint(

‎clippy_lints/src/lifetimes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ fn could_use_elision<'a, 'tcx: 'a>(
204204
let mut checker = BodyLifetimeChecker {
205205
lifetimes_used_in_body: false,
206206
};
207-
checker.visit_expr(&cx.tcx.hir.body(body_id).value);
207+
checker.visit_expr(&cx.tcx.hir().body(body_id).value);
208208
if checker.lifetimes_used_in_body {
209209
return false;
210210
}
@@ -324,7 +324,7 @@ impl<'v, 't> RefVisitor<'v, 't> {
324324
GenericArg::Type(_) => false,
325325
})
326326
{
327-
let hir_id = self.cx.tcx.hir.node_to_hir_id(ty.id);
327+
let hir_id = self.cx.tcx.hir().node_to_hir_id(ty.id);
328328
match self.cx.tables.qpath_def(qpath, hir_id) {
329329
Def::TyAlias(def_id) | Def::Struct(def_id) => {
330330
let generics = self.cx.tcx.generics_of(def_id);
@@ -360,7 +360,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
360360
self.collect_anonymous_lifetimes(path, ty);
361361
},
362362
TyKind::Def(item, _) => {
363-
if let ItemKind::Existential(ref exist_ty) = self.cx.tcx.hir.expect_item(item.id).node {
363+
if let ItemKind::Existential(ref exist_ty) = self.cx.tcx.hir().expect_item(item.id).node {
364364
for bound in &exist_ty.bounds {
365365
if let GenericBound::Outlives(_) = *bound {
366366
self.record(&None);

0 commit comments

Comments
 (0)