-use rustc::lint::*;
-use rustc::hir;
use crate::utils::{is_try, match_qpath, match_trait_method, paths, span_lint};
+use rustc::hir;
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use rustc::{declare_tool_lint, lint_array};
/// **What it does:** Checks for unused written/read amount.
///
}
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedIoAmount {
- fn check_stmt(&mut self, cx: &LateContext, s: &hir::Stmt) {
+ fn check_stmt(&mut self, cx: &LateContext<'_, '_>, s: &hir::Stmt) {
let expr = match s.node {
- hir::StmtSemi(ref expr, _) | hir::StmtExpr(ref expr, _) => &**expr,
+ hir::StmtKind::Semi(ref expr) | hir::StmtKind::Expr(ref expr) => &**expr,
_ => return,
};
match expr.node {
- hir::ExprMatch(ref res, _, _) if is_try(expr).is_some() => {
- if let hir::ExprCall(ref func, ref args) = res.node {
- if let hir::ExprPath(ref path) = func.node {
+ hir::ExprKind::Match(ref res, _, _) if is_try(expr).is_some() => {
+ if let hir::ExprKind::Call(ref func, ref args) = res.node {
+ if let hir::ExprKind::Path(ref path) = func.node {
if match_qpath(path, &paths::TRY_INTO_RESULT) && args.len() == 1 {
check_method_call(cx, &args[0], expr);
}
}
},
- hir::ExprMethodCall(ref path, _, ref args) => match &*path.ident.as_str() {
+ hir::ExprKind::MethodCall(ref path, _, ref args) => match &*path.ident.as_str() {
"expect" | "unwrap" | "unwrap_or" | "unwrap_or_else" => {
check_method_call(cx, &args[0], expr);
},
}
}
-fn check_method_call(cx: &LateContext, call: &hir::Expr, expr: &hir::Expr) {
- if let hir::ExprMethodCall(ref path, _, _) = call.node {
+fn check_method_call(cx: &LateContext<'_, '_>, call: &hir::Expr, expr: &hir::Expr) {
+ if let hir::ExprKind::MethodCall(ref path, _, _) = call.node {
let symbol = &*path.ident.as_str();
if match_trait_method(cx, call, &paths::IO_READ) && symbol == "read" {
span_lint(