len_zero: skip ranges if feature range_is_empty is not enabled

This commit is contained in:
Eduardo Broto 2020-05-28 00:36:15 +02:00
parent 7ea7cd165a
commit 64a05f56c3
6 changed files with 70 additions and 1 deletions

View file

@ -1,4 +1,4 @@
use crate::utils::{get_item_name, snippet_with_applicability, span_lint, span_lint_and_sugg, walk_ptrs_ty}; use crate::utils::{get_item_name, higher, snippet_with_applicability, span_lint, span_lint_and_sugg, walk_ptrs_ty};
use rustc_ast::ast::LitKind; use rustc_ast::ast::LitKind;
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::FxHashSet;
use rustc_errors::Applicability; use rustc_errors::Applicability;
@ -259,6 +259,17 @@ fn check_len(
/// Checks if this type has an `is_empty` method. /// Checks if this type has an `is_empty` method.
fn has_is_empty(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool { fn has_is_empty(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool {
/// Special case ranges until `range_is_empty` is stabilized. See issue 3807.
fn should_skip_range(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool {
higher::range(cx, expr).map_or(false, |_| {
!cx.tcx
.features()
.declared_lib_features
.iter()
.any(|(name, _)| name.as_str() == "range_is_empty")
})
}
/// Gets an `AssocItem` and return true if it matches `is_empty(self)`. /// Gets an `AssocItem` and return true if it matches `is_empty(self)`.
fn is_is_empty(cx: &LateContext<'_, '_>, item: &ty::AssocItem) -> bool { fn is_is_empty(cx: &LateContext<'_, '_>, item: &ty::AssocItem) -> bool {
if let ty::AssocKind::Fn = item.kind { if let ty::AssocKind::Fn = item.kind {
@ -284,6 +295,10 @@ fn has_is_empty(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool {
}) })
} }
if should_skip_range(cx, expr) {
return false;
}
let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr)); let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr));
match ty.kind { match ty.kind {
ty::Dynamic(ref tt, ..) => { ty::Dynamic(ref tt, ..) => {

View file

@ -141,3 +141,11 @@ fn main() {
fn test_slice(b: &[u8]) { fn test_slice(b: &[u8]) {
if !b.is_empty() {} if !b.is_empty() {}
} }
mod issue_3807 {
// Avoid suggesting changes to ranges if the user did not enable `range_is_empty`.
// See https://github.com/rust-lang/rust/issues/48111#issuecomment-445132965
fn no_suggestion() {
let _ = (0..42).len() == 0;
}
}

View file

@ -141,3 +141,11 @@ fn main() {
fn test_slice(b: &[u8]) { fn test_slice(b: &[u8]) {
if b.len() != 0 {} if b.len() != 0 {}
} }
mod issue_3807 {
// Avoid suggesting changes to ranges if the user did not enable `range_is_empty`.
// See https://github.com/rust-lang/rust/issues/48111#issuecomment-445132965
fn no_suggestion() {
let _ = (0..42).len() == 0;
}
}

View file

@ -0,0 +1,14 @@
// run-rustfix
#![feature(range_is_empty)]
#![warn(clippy::len_zero)]
#![allow(unused)]
mod issue_3807 {
// With the feature enabled, `is_empty` should be suggested
fn suggestion_is_fine() {
let _ = (0..42).is_empty();
}
}
fn main() {}

View file

@ -0,0 +1,14 @@
// run-rustfix
#![feature(range_is_empty)]
#![warn(clippy::len_zero)]
#![allow(unused)]
mod issue_3807 {
// With the feature enabled, `is_empty` should be suggested
fn suggestion_is_fine() {
let _ = (0..42).len() == 0;
}
}
fn main() {}

View file

@ -0,0 +1,10 @@
error: length comparison to zero
--> $DIR/len_zero_ranges.rs:10:17
|
LL | let _ = (0..42).len() == 0;
| ^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `(0..42).is_empty()`
|
= note: `-D clippy::len-zero` implied by `-D warnings`
error: aborting due to previous error