-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use crate::rustc::{declare_tool_lint, lint_array};
use if_chain::if_chain;
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use rustc::{declare_tool_lint, lint_array};
use crate::utils::{in_macro, match_type, paths, span_lint_and_then, usage::is_potentially_mutated};
-use crate::rustc::hir::intravisit::*;
-use crate::rustc::hir::*;
-use crate::syntax::ast::NodeId;
-use crate::syntax::source_map::Span;
+use rustc::hir::intravisit::*;
+use rustc::hir::*;
+use syntax::source_map::Span;
-/// **What it does:** Checks for calls of `unwrap[_err]()` that cannot fail.
-///
-/// **Why is this bad?** Using `if let` or `match` is more idiomatic.
-///
-/// **Known problems:** Limitations of the borrow checker might make unwrap() necessary sometimes?
-///
-/// **Example:**
-/// ```rust
-/// if option.is_some() {
-/// do_something_with(option.unwrap())
-/// }
-/// ```
-///
-/// Could be written:
-///
-/// ```rust
-/// if let Some(value) = option {
-/// do_something_with(value)
-/// }
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for calls of `unwrap[_err]()` that cannot fail.
+ ///
+ /// **Why is this bad?** Using `if let` or `match` is more idiomatic.
+ ///
+ /// **Known problems:** Limitations of the borrow checker might make unwrap() necessary sometimes?
+ ///
+ /// **Example:**
+ /// ```rust
+ /// if option.is_some() {
+ /// do_something_with(option.unwrap())
+ /// }
+ /// ```
+ ///
+ /// Could be written:
+ ///
+ /// ```rust
+ /// if let Some(value) = option {
+ /// do_something_with(value)
+ /// }
+ /// ```
pub UNNECESSARY_UNWRAP,
nursery,
"checks for calls of unwrap[_err]() that cannot fail"
}
-/// **What it does:** Checks for calls of `unwrap[_err]()` that will always fail.
-///
-/// **Why is this bad?** If panicking is desired, an explicit `panic!()` should be used.
-///
-/// **Known problems:** This lint only checks `if` conditions not assignments.
-/// So something like `let x: Option<()> = None; x.unwrap();` will not be recognized.
-///
-/// **Example:**
-/// ```rust
-/// if option.is_none() {
-/// do_something_with(option.unwrap())
-/// }
-/// ```
-///
-/// This code will always panic. The if condition should probably be inverted.
declare_clippy_lint! {
+ /// **What it does:** Checks for calls of `unwrap[_err]()` that will always fail.
+ ///
+ /// **Why is this bad?** If panicking is desired, an explicit `panic!()` should be used.
+ ///
+ /// **Known problems:** This lint only checks `if` conditions not assignments.
+ /// So something like `let x: Option<()> = None; x.unwrap();` will not be recognized.
+ ///
+ /// **Example:**
+ /// ```rust
+ /// if option.is_none() {
+ /// do_something_with(option.unwrap())
+ /// }
+ /// ```
+ ///
+ /// This code will always panic. The if condition should probably be inverted.
pub PANICKING_UNWRAP,
nursery,
"checks for calls of unwrap[_err]() that will always fail"
}
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
- NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir)
+ NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir())
}
}
fn get_lints(&self) -> LintArray {
lint_array!(PANICKING_UNWRAP, UNNECESSARY_UNWRAP)
}
+
+ fn name(&self) -> &'static str {
+ "Unwrap"
+ }
}
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
decl: &'tcx FnDecl,
body: &'tcx Body,
span: Span,
- fn_id: NodeId,
+ fn_id: HirId,
) {
if in_macro(span) {
return;