use crate::utils::{match_def_path, snippet_with_applicability, span_lint_and_sugg};
use if_chain::if_chain;
-use rustc::hir;
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::ty;
-use rustc::{declare_lint_pass, declare_tool_lint};
use rustc_errors::Applicability;
+use rustc_hir as hir;
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_middle::ty;
+use rustc_session::{declare_lint_pass, declare_tool_lint};
declare_clippy_lint! {
- /// **What it does:** Checks for `.to_digit().is_some()` on `char`s.
+ /// **What it does:** Checks for `.to_digit(..).is_some()` on `char`s.
///
/// **Why is this bad?** This is a convoluted way of checking if a `char` is a digit. It's
- /// more straight forward use the dedicated `is_digit` method.
+ /// more straight forward to use the dedicated `is_digit` method.
///
/// **Example:**
/// ```rust
- /// # let x: char = 'x'
- /// let is_digit = x.to_digit().is_some();
+ /// # let c = 'c';
+ /// # let radix = 10;
+ /// let is_digit = c.to_digit(radix).is_some();
/// ```
/// can be written as:
/// ```
- /// # let x: char = 'x'
- /// let is_digit = x.is_digit();
+ /// # let c = 'c';
+ /// # let radix = 10;
+ /// let is_digit = c.is_digit(radix);
/// ```
pub TO_DIGIT_IS_SOME,
style,
declare_lint_pass!(ToDigitIsSome => [TO_DIGIT_IS_SOME]);
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ToDigitIsSome {
- fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
+impl<'tcx> LateLintPass<'tcx> for ToDigitIsSome {
+ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx hir::Expr<'_>) {
if_chain! {
- if let hir::ExprKind::MethodCall(is_some_path, _, is_some_args) = &expr.kind;
+ if let hir::ExprKind::MethodCall(is_some_path, _, is_some_args, _) = &expr.kind;
if is_some_path.ident.name.as_str() == "is_some";
if let [to_digit_expr] = &**is_some_args;
then {
let match_result = match &to_digit_expr.kind {
- hir::ExprKind::MethodCall(to_digits_path, _, to_digit_args) => {
+ hir::ExprKind::MethodCall(to_digits_path, _, to_digit_args, _) => {
if_chain! {
if let [char_arg, radix_arg] = &**to_digit_args;
if to_digits_path.ident.name.as_str() == "to_digit";
- let char_arg_ty = cx.tables.expr_ty_adjusted(char_arg);
- if char_arg_ty.kind == ty::Char;
+ let char_arg_ty = cx.typeck_results().expr_ty_adjusted(char_arg);
+ if *char_arg_ty.kind() == ty::Char;
then {
Some((true, char_arg, radix_arg))
} else {
if_chain! {
if let [char_arg, radix_arg] = &**to_digit_args;
if let hir::ExprKind::Path(to_digits_path) = &to_digits_call.kind;
- if let to_digits_call_res = cx.tables.qpath_res(to_digits_path, to_digits_call.hir_id);
+ if let to_digits_call_res = cx.qpath_res(to_digits_path, to_digits_call.hir_id);
if let Some(to_digits_def_id) = to_digits_call_res.opt_def_id();
if match_def_path(cx, to_digits_def_id, &["core", "char", "methods", "<impl char>", "to_digit"]);
then {