Use inputs/output getters for rustc::ty::FnSig instead of the now non-existent fields.

diff --git a/clippy_lints/src/cyclomatic_complexity.rs b/clippy_lints/src/cyclomatic_complexity.rs
index 164633b7c6445281cbaf7b16d77ea1c980e05e86..fc9e25c7707ef7fbc07f12e51ce1bd3b5e0d0198 100644 (file)
--- a/clippy_lints/src/cyclomatic_complexity.rs
+++ b/clippy_lints/src/cyclomatic_complexity.rs
@@ -142,7 +142,7 @@ fn visit_expr(&mut self, e: &'tcx Expr) {
                 let ty = self.cx.tcx.tables().node_id_to_type(callee.id);
                 match ty.sty {
                     ty::TyFnDef(_, _, ty) |
-                    ty::TyFnPtr(ty) if ty.sig.skip_binder().output.sty == ty::TyNever => {
+                    ty::TyFnPtr(ty) if ty.sig.skip_binder().output().sty == ty::TyNever => {
                         self.divergence += 1;
                     }
                     _ => (),

diff --git a/clippy_lints/src/eta_reduction.rs b/clippy_lints/src/eta_reduction.rs
index 56308ed390d8b6ce9c1d89f28c76fa67d34f1323..2bf91f8d1bce109a836dd830935ce6fd099e53ae 100644 (file)
--- a/clippy_lints/src/eta_reduction.rs
+++ b/clippy_lints/src/eta_reduction.rs
@@ -66,7 +66,7 @@ fn check_closure(cx: &LateContext, expr: &Expr) {
                 ty::TyFnDef(_, _, fn_ty) |
                 ty::TyFnPtr(fn_ty) => {
                     if fn_ty.unsafety == Unsafety::Unsafe ||
-                       fn_ty.sig.skip_binder().output.sty == ty::TyNever {
+                       fn_ty.sig.skip_binder().output().sty == ty::TyNever {
                         return;
                     }
                 }

diff --git a/clippy_lints/src/eval_order_dependence.rs b/clippy_lints/src/eval_order_dependence.rs
index 9e9a900fe7ab92f2ce870db685f3e5e2085c09ad..88e1180067a754aa3c90b65497c1e1359a2a7760 100644 (file)
--- a/clippy_lints/src/eval_order_dependence.rs
+++ b/clippy_lints/src/eval_order_dependence.rs
@@ -132,7 +132,7 @@ fn visit_expr(&mut self, e: &'tcx Expr) {
             ExprRet(_) => self.report_diverging_sub_expr(e),
             ExprCall(ref func, _) => match self.cx.tcx.tables().expr_ty(func).sty {
                 ty::TyFnDef(_, _, fn_ty) |
-                ty::TyFnPtr(fn_ty) => if let ty::TyNever = self.cx.tcx.erase_late_bound_regions(&fn_ty.sig).output.sty {
+                ty::TyFnPtr(fn_ty) => if let ty::TyNever = self.cx.tcx.erase_late_bound_regions(&fn_ty.sig).output().sty {
                     self.report_diverging_sub_expr(e);
                 },
                 _ => {},

diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs
index fd58f86d42f66bcfae10c016f174c17da88abb9e..0242fb523ee57aa3d1f78a61aeb11b012fa26102 100644 (file)
--- a/clippy_lints/src/len_zero.rs
+++ b/clippy_lints/src/len_zero.rs
@@ -188,7 +188,7 @@ fn is_is_empty(cx: &LateContext, item: &ty::AssociatedItem) -> bool {
         if let ty::AssociatedKind::Method = item.kind {
             if &*item.name.as_str() == "is_empty" {
                 let ty = cx.tcx.item_type(item.def_id).fn_sig().skip_binder();
-                ty.inputs.len() == 1
+                ty.inputs().len() == 1
             } else {
                 false
             }

diff --git a/clippy_lints/src/mut_reference.rs b/clippy_lints/src/mut_reference.rs
index c189ecba6de714ff21d0b1f8af6f350551b629fc..d2cd0a329143d8aac88c8de403c9972699c0bd81 100644 (file)
--- a/clippy_lints/src/mut_reference.rs
+++ b/clippy_lints/src/mut_reference.rs
@@ -60,7 +60,7 @@ fn check_arguments(cx: &LateContext, arguments: &[Expr], type_definition: &TyS,
     match type_definition.sty {
         TypeVariants::TyFnDef(_, _, fn_type) |
         TypeVariants::TyFnPtr(fn_type) => {
-            let parameters = &fn_type.sig.skip_binder().inputs;
+            let parameters = fn_type.sig.skip_binder().inputs();
             for (argument, parameter) in arguments.iter().zip(parameters.iter()) {
                 match parameter.sty {
                     TypeVariants::TyRef(_, TypeAndMut { mutbl: MutImmutable, .. }) |

diff --git a/clippy_lints/src/ptr.rs b/clippy_lints/src/ptr.rs
index f1fdc78aca4a46651c1334592204a480c7b375b0..1461189946c15005f63413258675265e8141795c 100644 (file)
--- a/clippy_lints/src/ptr.rs
+++ b/clippy_lints/src/ptr.rs
@@ -94,7 +94,7 @@ fn check_fn(cx: &LateContext, decl: &FnDecl, fn_id: NodeId) {
     let fn_def_id = cx.tcx.map.local_def_id(fn_id);
     let fn_ty = cx.tcx.item_type(fn_def_id).fn_sig().skip_binder();
 
-    for (arg, ty) in decl.inputs.iter().zip(&fn_ty.inputs) {
+    for (arg, ty) in decl.inputs.iter().zip(fn_ty.inputs()) {
         if let ty::TyRef(_, ty::TypeAndMut { ty, mutbl: MutImmutable }) = ty.sty {
             if match_type(cx, ty, &paths::VEC) {
                 span_lint(cx,

diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index dc64e56b2e683c984be93f8bae4e8f16ad84ffa9..d8afb96298d4bf9e4c07ffeae338d4e27f52f09b 100644 (file)
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -751,7 +751,7 @@ pub fn return_ty<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, fn_item: NodeId) -> ty::T
     let fn_def_id = cx.tcx.map.local_def_id(fn_item);
     let fn_sig = cx.tcx.item_type(fn_def_id).fn_sig();
     let fn_sig = cx.tcx.liberate_late_bound_regions(parameter_env.free_id_outlive, fn_sig);
-    fn_sig.output
+    fn_sig.output()
 }
 
 /// Check if two types are the same.