make early-pass

Author: ada4a

clippy_lints/src/lib.rs

@@ -617,7 +617,7 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(move |_| Box::new(collapsible_if::CollapsibleIf::new(conf)));
     store.register_late_pass(|_| Box::new(items_after_statements::ItemsAfterStatements));
     store.register_early_pass(|| Box::new(precedence::Precedence));
-    store.register_late_pass(|_| Box::new(needless_parens_on_range_literals::NeedlessParensOnRangeLiterals));
+    store.register_early_pass(|| Box::new(needless_parens_on_range_literals::NeedlessParensOnRangeLiterals));
     store.register_early_pass(|| Box::new(needless_continue::NeedlessContinue));
     store.register_early_pass(|| Box::new(redundant_else::RedundantElse));
     store.register_late_pass(|_| Box::new(create_dir::CreateDir));

clippy_lints/src/needless_parens_on_range_literals.rs

@@ -1,11 +1,9 @@
 use clippy_utils::diagnostics::span_lint_and_sugg;
-use clippy_utils::higher;
-use clippy_utils::source::{SpanRangeExt, snippet_with_applicability};
+use clippy_utils::source::snippet_with_applicability;
 
-use rustc_ast::ast;
+use rustc_ast::{Expr, ExprKind};
 use rustc_errors::Applicability;
-use rustc_hir::{Expr, ExprKind};
-use rustc_lint::{LateContext, LateLintPass};
+use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_session::declare_lint_pass;
 
 declare_clippy_lint! {
@@ -40,19 +38,11 @@ declare_clippy_lint! {
 
 declare_lint_pass!(NeedlessParensOnRangeLiterals => [NEEDLESS_PARENS_ON_RANGE_LITERALS]);
 
-fn check_for_parens(cx: &LateContext<'_>, e: &Expr<'_>, is_start: bool) {
-    if is_start
-        && let ExprKind::Lit(literal) = e.kind
-        && let ast::LitKind::Float(_sym, ast::LitFloatType::Unsuffixed) = literal.node
-    {
+fn check_for_parens(cx: &EarlyContext<'_>, e: &Expr, is_start: bool) {
+    if let ExprKind::Paren(literal) = &e.kind
+        && let ExprKind::Lit(lit) = &literal.kind
         // don't check floating point literals on the start expression of a range
-        return;
-    }
-    if let ExprKind::Lit(literal) = e.kind
-        // the indicator that parenthesis surround the literal is that the span of the expression and the literal differ
-        && literal.span != e.span
-        // inspect the source code of the expression for parenthesis
-        && e.span.check_source_text(cx, |s| s.starts_with('(') && s.ends_with(')'))
+        && !(is_start && lit.kind == rustc_ast::token::LitKind::Float && lit.suffix.is_none())
     {
         let mut applicability = Applicability::MachineApplicable;
         let suggestion = snippet_with_applicability(cx, literal.span, "_", &mut applicability);
@@ -68,9 +58,9 @@ fn check_for_parens(cx: &LateContext<'_>, e: &Expr<'_>, is_start: bool) {
     }
 }
 
-impl<'tcx> LateLintPass<'tcx> for NeedlessParensOnRangeLiterals {
-    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
-        if let Some(higher::Range { start, end, .. }) = higher::Range::hir(expr) {
+impl EarlyLintPass for NeedlessParensOnRangeLiterals {
+    fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
+        if let ExprKind::Range(start, end, ..) = &expr.kind {
             if let Some(start) = start {
                 check_for_parens(cx, start, true);
             }