Add lint for From<String>
This commit is contained in:
parent
0e489f3221
commit
e5076d06db
136
clippy_lints/src/impl_from_str.rs
Normal file
136
clippy_lints/src/impl_from_str.rs
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
use rustc::lint::*;
|
||||||
|
use rustc::hir;
|
||||||
|
use rustc::ty;
|
||||||
|
use syntax_pos::Span;
|
||||||
|
use utils::{method_chain_args, match_def_path, span_lint_and_then, walk_ptrs_ty};
|
||||||
|
use utils::paths::{BEGIN_PANIC, BEGIN_PANIC_FMT, FROM_TRAIT, OPTION, RESULT, STRING};
|
||||||
|
|
||||||
|
/// **What it does:** Checks for impls of `From<&str>` and `From<String>` that contain `panic!()` or
|
||||||
|
/// `unwrap()`
|
||||||
|
///
|
||||||
|
/// **Why is this bad?** `FromStr` should be used if there's a possibility of failure.
|
||||||
|
///
|
||||||
|
/// **Known problems:** None.
|
||||||
|
///
|
||||||
|
/// **Example:**
|
||||||
|
/// ```rust
|
||||||
|
/// struct Foo(i32);
|
||||||
|
/// impl From<String> for Foo {
|
||||||
|
/// fn from(s: String) -> Self {
|
||||||
|
/// Foo(s.parse().unwrap())
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
declare_lint! {
|
||||||
|
pub IMPL_FROM_STR, Warn,
|
||||||
|
"Warn on impls of `From<&str>` and `From<String>` that contain `panic!()` or `unwrap()`"
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct ImplFromStr;
|
||||||
|
|
||||||
|
impl LintPass for ImplFromStr {
|
||||||
|
fn get_lints(&self) -> LintArray {
|
||||||
|
lint_array!(IMPL_FROM_STR)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImplFromStr {
|
||||||
|
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) {
|
||||||
|
// check for `impl From<???> for ..`
|
||||||
|
let impl_def_id = cx.tcx.hir.local_def_id(item.id);
|
||||||
|
if_let_chain!{[
|
||||||
|
let hir::ItemImpl(.., ref impl_items) = item.node,
|
||||||
|
let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_def_id),
|
||||||
|
match_def_path(cx.tcx, impl_trait_ref.def_id, &FROM_TRAIT),
|
||||||
|
], {
|
||||||
|
// check if the type parameter is `str` or `String`
|
||||||
|
let from_ty_param = impl_trait_ref.substs.type_at(1);
|
||||||
|
let base_from_ty_param =
|
||||||
|
walk_ptrs_ty(cx.tcx.normalize_associated_type(&from_ty_param));
|
||||||
|
if base_from_ty_param.sty == ty::TyStr ||
|
||||||
|
match_type(cx.tcx, base_from_ty_param, &STRING)
|
||||||
|
{
|
||||||
|
lint_impl_body(cx, item.span, impl_items);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_items: &hir::HirVec<hir::ImplItemRef>) {
|
||||||
|
use rustc::hir::*;
|
||||||
|
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
|
||||||
|
|
||||||
|
struct FindPanicUnwrap<'a, 'tcx: 'a> {
|
||||||
|
tcx: ty::TyCtxt<'a, 'tcx, 'tcx>,
|
||||||
|
tables: &'tcx ty::TypeckTables<'tcx>,
|
||||||
|
result: Vec<Span>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, 'tcx: 'a> Visitor<'tcx> for FindPanicUnwrap<'a, 'tcx> {
|
||||||
|
fn visit_expr(&mut self, expr: &'tcx Expr) {
|
||||||
|
// check for `begin_panic`
|
||||||
|
if_let_chain!{[
|
||||||
|
let ExprCall(ref func_expr, _) = expr.node,
|
||||||
|
let ExprPath(QPath::Resolved(_, ref path)) = func_expr.node,
|
||||||
|
match_def_path(self.tcx, path.def.def_id(), &BEGIN_PANIC) ||
|
||||||
|
match_def_path(self.tcx, path.def.def_id(), &BEGIN_PANIC_FMT),
|
||||||
|
], {
|
||||||
|
self.result.push(expr.span);
|
||||||
|
}}
|
||||||
|
|
||||||
|
// check for `unwrap`
|
||||||
|
if let Some(arglists) = method_chain_args(expr, &["unwrap"]) {
|
||||||
|
let reciever_ty = walk_ptrs_ty(self.tables.expr_ty(&arglists[0][0]));
|
||||||
|
if match_type(self.tcx, reciever_ty, &OPTION) ||
|
||||||
|
match_type(self.tcx, reciever_ty, &RESULT)
|
||||||
|
{
|
||||||
|
self.result.push(expr.span);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// and check sub-expressions
|
||||||
|
intravisit::walk_expr(self, expr);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
|
||||||
|
NestedVisitorMap::None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for impl_item in impl_items {
|
||||||
|
if_let_chain!{[
|
||||||
|
impl_item.name == "from",
|
||||||
|
let ImplItemKind::Method(_, body_id) =
|
||||||
|
cx.tcx.hir.impl_item(impl_item.id).node,
|
||||||
|
], {
|
||||||
|
// check the body for `begin_panic` or `unwrap`
|
||||||
|
let body = cx.tcx.hir.body(body_id);
|
||||||
|
let impl_item_def_id = cx.tcx.hir.local_def_id(impl_item.id.node_id);
|
||||||
|
let mut fpu = FindPanicUnwrap {
|
||||||
|
tcx: cx.tcx,
|
||||||
|
tables: cx.tcx.typeck_tables_of(impl_item_def_id),
|
||||||
|
result: Vec::new(),
|
||||||
|
};
|
||||||
|
fpu.visit_expr(&body.value);
|
||||||
|
|
||||||
|
// if we've found one, lint
|
||||||
|
if !fpu.result.is_empty() {
|
||||||
|
span_lint_and_then(
|
||||||
|
cx,
|
||||||
|
IMPL_FROM_STR,
|
||||||
|
impl_span,
|
||||||
|
"consider implementing `FromStr` instead",
|
||||||
|
move |db| {
|
||||||
|
db.span_note(fpu.result, "potential failure(s)");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn match_type(tcx: ty::TyCtxt, ty: ty::Ty, path: &[&str]) -> bool {
|
||||||
|
match ty.sty {
|
||||||
|
ty::TyAdt(adt, _) => match_def_path(tcx, adt.did, path),
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
@ -100,6 +100,7 @@ pub mod identity_conversion;
|
|||||||
pub mod identity_op;
|
pub mod identity_op;
|
||||||
pub mod if_let_redundant_pattern_matching;
|
pub mod if_let_redundant_pattern_matching;
|
||||||
pub mod if_not_else;
|
pub mod if_not_else;
|
||||||
|
pub mod impl_from_str;
|
||||||
pub mod infinite_iter;
|
pub mod infinite_iter;
|
||||||
pub mod int_plus_one;
|
pub mod int_plus_one;
|
||||||
pub mod invalid_ref;
|
pub mod invalid_ref;
|
||||||
@ -341,6 +342,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
|
|||||||
reg.register_late_lint_pass(box identity_conversion::IdentityConversion::default());
|
reg.register_late_lint_pass(box identity_conversion::IdentityConversion::default());
|
||||||
reg.register_late_lint_pass(box types::ImplicitHasher);
|
reg.register_late_lint_pass(box types::ImplicitHasher);
|
||||||
reg.register_early_lint_pass(box const_static_lifetime::StaticConst);
|
reg.register_early_lint_pass(box const_static_lifetime::StaticConst);
|
||||||
|
reg.register_late_lint_pass(box impl_from_str::ImplFromStr);
|
||||||
|
|
||||||
reg.register_lint_group("clippy_restrictions", vec![
|
reg.register_lint_group("clippy_restrictions", vec![
|
||||||
arithmetic::FLOAT_ARITHMETIC,
|
arithmetic::FLOAT_ARITHMETIC,
|
||||||
@ -446,6 +448,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
|
|||||||
identity_conversion::IDENTITY_CONVERSION,
|
identity_conversion::IDENTITY_CONVERSION,
|
||||||
identity_op::IDENTITY_OP,
|
identity_op::IDENTITY_OP,
|
||||||
if_let_redundant_pattern_matching::IF_LET_REDUNDANT_PATTERN_MATCHING,
|
if_let_redundant_pattern_matching::IF_LET_REDUNDANT_PATTERN_MATCHING,
|
||||||
|
impl_from_str::IMPL_FROM_STR,
|
||||||
infinite_iter::INFINITE_ITER,
|
infinite_iter::INFINITE_ITER,
|
||||||
invalid_ref::INVALID_REF,
|
invalid_ref::INVALID_REF,
|
||||||
is_unit_expr::UNIT_EXPR,
|
is_unit_expr::UNIT_EXPR,
|
||||||
|
@ -6,6 +6,7 @@ pub const ARC: [&str; 3] = ["alloc", "arc", "Arc"];
|
|||||||
pub const ASMUT_TRAIT: [&str; 3] = ["core", "convert", "AsMut"];
|
pub const ASMUT_TRAIT: [&str; 3] = ["core", "convert", "AsMut"];
|
||||||
pub const ASREF_TRAIT: [&str; 3] = ["core", "convert", "AsRef"];
|
pub const ASREF_TRAIT: [&str; 3] = ["core", "convert", "AsRef"];
|
||||||
pub const BEGIN_PANIC: [&str; 3] = ["std", "panicking", "begin_panic"];
|
pub const BEGIN_PANIC: [&str; 3] = ["std", "panicking", "begin_panic"];
|
||||||
|
pub const BEGIN_PANIC_FMT: [&str; 3] = ["std", "panicking", "begin_panic_fmt"];
|
||||||
pub const BINARY_HEAP: [&str; 3] = ["alloc", "binary_heap", "BinaryHeap"];
|
pub const BINARY_HEAP: [&str; 3] = ["alloc", "binary_heap", "BinaryHeap"];
|
||||||
pub const BORROW_TRAIT: [&str; 3] = ["core", "borrow", "Borrow"];
|
pub const BORROW_TRAIT: [&str; 3] = ["core", "borrow", "Borrow"];
|
||||||
pub const BOX: [&str; 3] = ["std", "boxed", "Box"];
|
pub const BOX: [&str; 3] = ["std", "boxed", "Box"];
|
||||||
@ -27,6 +28,7 @@ pub const DROP: [&str; 3] = ["core", "mem", "drop"];
|
|||||||
pub const FMT_ARGUMENTS_NEWV1: [&str; 4] = ["core", "fmt", "Arguments", "new_v1"];
|
pub const FMT_ARGUMENTS_NEWV1: [&str; 4] = ["core", "fmt", "Arguments", "new_v1"];
|
||||||
pub const FMT_ARGUMENTV1_NEW: [&str; 4] = ["core", "fmt", "ArgumentV1", "new"];
|
pub const FMT_ARGUMENTV1_NEW: [&str; 4] = ["core", "fmt", "ArgumentV1", "new"];
|
||||||
pub const FROM_FROM: [&str; 4] = ["core", "convert", "From", "from"];
|
pub const FROM_FROM: [&str; 4] = ["core", "convert", "From", "from"];
|
||||||
|
pub const FROM_TRAIT: [&str; 3] = ["core", "convert", "From"];
|
||||||
pub const HASH: [&str; 2] = ["hash", "Hash"];
|
pub const HASH: [&str; 2] = ["hash", "Hash"];
|
||||||
pub const HASHMAP: [&str; 5] = ["std", "collections", "hash", "map", "HashMap"];
|
pub const HASHMAP: [&str; 5] = ["std", "collections", "hash", "map", "HashMap"];
|
||||||
pub const HASHMAP_ENTRY: [&str; 5] = ["std", "collections", "hash", "map", "Entry"];
|
pub const HASHMAP_ENTRY: [&str; 5] = ["std", "collections", "hash", "map", "Entry"];
|
||||||
|
69
tests/ui/impl_from_str.rs
Normal file
69
tests/ui/impl_from_str.rs
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
// docs example
|
||||||
|
struct Foo(i32);
|
||||||
|
impl From<String> for Foo {
|
||||||
|
fn from(s: String) -> Self {
|
||||||
|
Foo(s.parse().unwrap())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
struct Valid(Vec<u8>);
|
||||||
|
|
||||||
|
impl<'a> From<&'a str> for Valid {
|
||||||
|
fn from(s: &'a str) -> Valid {
|
||||||
|
Valid(s.to_owned().into_bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<String> for Valid {
|
||||||
|
fn from(s: String) -> Valid {
|
||||||
|
Valid(s.into_bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<usize> for Valid {
|
||||||
|
fn from(i: usize) -> Valid {
|
||||||
|
if i == 0 {
|
||||||
|
panic!();
|
||||||
|
}
|
||||||
|
Valid(Vec::with_capacity(i))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
struct Invalid;
|
||||||
|
|
||||||
|
impl<'a> From<&'a str> for Invalid {
|
||||||
|
fn from(s: &'a str) -> Invalid {
|
||||||
|
if !s.is_empty() {
|
||||||
|
panic!();
|
||||||
|
}
|
||||||
|
Invalid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<String> for Invalid {
|
||||||
|
fn from(s: String) -> Invalid {
|
||||||
|
if !s.is_empty() {
|
||||||
|
panic!(42);
|
||||||
|
} else if s.parse::<u32>().unwrap() != 42 {
|
||||||
|
panic!("{:?}", s);
|
||||||
|
}
|
||||||
|
Invalid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
trait ProjStrTrait {
|
||||||
|
type ProjString;
|
||||||
|
}
|
||||||
|
impl<T> ProjStrTrait for Box<T> {
|
||||||
|
type ProjString = String;
|
||||||
|
}
|
||||||
|
impl<'a> From<&'a mut <Box<u32> as ProjStrTrait>::ProjString> for Invalid {
|
||||||
|
fn from(s: &'a mut <Box<u32> as ProjStrTrait>::ProjString) -> Invalid {
|
||||||
|
if s.parse::<u32>().ok().unwrap() != 42 {
|
||||||
|
panic!("{:?}", s);
|
||||||
|
}
|
||||||
|
Invalid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
80
tests/ui/impl_from_str.stderr
Normal file
80
tests/ui/impl_from_str.stderr
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
error: consider implementing `FromStr` instead
|
||||||
|
--> $DIR/impl_from_str.rs:3:1
|
||||||
|
|
|
||||||
|
3 | / impl From<String> for Foo {
|
||||||
|
4 | | fn from(s: String) -> Self {
|
||||||
|
5 | | Foo(s.parse().unwrap())
|
||||||
|
6 | | }
|
||||||
|
7 | | }
|
||||||
|
| |_^
|
||||||
|
|
|
||||||
|
= note: `-D impl-from-str` implied by `-D warnings`
|
||||||
|
note: potential failure(s)
|
||||||
|
--> $DIR/impl_from_str.rs:5:13
|
||||||
|
|
|
||||||
|
5 | Foo(s.parse().unwrap())
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: consider implementing `FromStr` instead
|
||||||
|
--> $DIR/impl_from_str.rs:34:1
|
||||||
|
|
|
||||||
|
34 | / impl<'a> From<&'a str> for Invalid {
|
||||||
|
35 | | fn from(s: &'a str) -> Invalid {
|
||||||
|
36 | | if !s.is_empty() {
|
||||||
|
37 | | panic!();
|
||||||
|
... |
|
||||||
|
40 | | }
|
||||||
|
41 | | }
|
||||||
|
| |_^
|
||||||
|
|
|
||||||
|
note: potential failure(s)
|
||||||
|
--> $DIR/impl_from_str.rs:37:13
|
||||||
|
|
|
||||||
|
37 | panic!();
|
||||||
|
| ^^^^^^^^^
|
||||||
|
= note: this error originates in a macro outside of the current crate
|
||||||
|
|
||||||
|
error: consider implementing `FromStr` instead
|
||||||
|
--> $DIR/impl_from_str.rs:43:1
|
||||||
|
|
|
||||||
|
43 | / impl From<String> for Invalid {
|
||||||
|
44 | | fn from(s: String) -> Invalid {
|
||||||
|
45 | | if !s.is_empty() {
|
||||||
|
46 | | panic!(42);
|
||||||
|
... |
|
||||||
|
51 | | }
|
||||||
|
52 | | }
|
||||||
|
| |_^
|
||||||
|
|
|
||||||
|
note: potential failure(s)
|
||||||
|
--> $DIR/impl_from_str.rs:46:13
|
||||||
|
|
|
||||||
|
46 | panic!(42);
|
||||||
|
| ^^^^^^^^^^^
|
||||||
|
47 | } else if s.parse::<u32>().unwrap() != 42 {
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
48 | panic!("{:?}", s);
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
= note: this error originates in a macro outside of the current crate
|
||||||
|
|
||||||
|
error: consider implementing `FromStr` instead
|
||||||
|
--> $DIR/impl_from_str.rs:60:1
|
||||||
|
|
|
||||||
|
60 | / impl<'a> From<&'a mut <Box<u32> as ProjStrTrait>::ProjString> for Invalid {
|
||||||
|
61 | | fn from(s: &'a mut <Box<u32> as ProjStrTrait>::ProjString) -> Invalid {
|
||||||
|
62 | | if s.parse::<u32>().ok().unwrap() != 42 {
|
||||||
|
63 | | panic!("{:?}", s);
|
||||||
|
... |
|
||||||
|
66 | | }
|
||||||
|
67 | | }
|
||||||
|
| |_^
|
||||||
|
|
|
||||||
|
note: potential failure(s)
|
||||||
|
--> $DIR/impl_from_str.rs:62:12
|
||||||
|
|
|
||||||
|
62 | if s.parse::<u32>().ok().unwrap() != 42 {
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
63 | panic!("{:?}", s);
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
= note: this error originates in a macro outside of the current crate
|
||||||
|
|
Loading…
Reference in New Issue
Block a user