OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added more test, now works with vecs and iter

Browse Source
This commit is contained in:
llogiq 2016-01-25 19:46:56 +01:00
parent ed96583677
commit 2d97f916eb
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/methods.rs
View File

@ -448,7 +448,7 @@ fn lint_extend(cx: &LateContext, expr: &Expr, args: &MethodArgs) {
return; // for your Vecs only
}
if derefs_to_slice(&arg_ty) {
if derefs_to_slice(cx, &args[1], &arg_ty) {
span_lint(cx, EXTEND_FROM_SLICE, expr.span,
&format!("use of `extend` to extend a Vec by a slice"))
.span_suggestion(expr.span, "try this",
@ -458,13 +458,17 @@ fn lint_extend(cx: &LateContext, expr: &Expr, args: &MethodArgs) {
}
}
fn derefs_to_slice(ty: &ty::Ty) -> bool {
fn derefs_to_slice(cx: &LateContext, expr: &Expr, ty: &ty::Ty) -> bool {
if let ExprMethodCall(name, _, ref args) = expr.node {
return &name.node.as_str() == &"iter" &&
derefs_to_slice(cx, &args[0], &cx.tcx.expr_ty(&args[0]))
}
match ty.sty {
ty::TySlice(_) |
ty::TyStr => true,
ty::TyBox(ref inner) => derefs_to_slice(inner),
ty::TyStruct(..) => match_type(cx, ty, &VEC_PATH),
ty::TySlice(_) => true,
ty::TyArray(_, size) => size < 32,
ty::TyRef(_, ty::TypeAndMut { ty: ref t, .. }) => derefs_to_slice(t),
ty::TyRef(_, ty::TypeAndMut { ty: ref inner, .. }) |
ty::TyBox(ref inner) => derefs_to_slice(cx, expr, inner),
_ => false
}
}

7
tests/compile-fail/methods.rs
View File

@ -308,6 +308,9 @@ fn starts_with() {
fn use_extend_from_slice() {
let mut v : Vec<&'static str> = vec![];
v.extend(&["Hello", "World"]); //~ERROR use of `extend`
v.extend(vec!["Some", "more"]); //~ERROR use of `extend`
v.extend(vec!["And", "even", "more"].iter()); //~ERROR use of `extend`
let o : Option<&'static str> = None;
v.extend(o);
v.extend(Some("Bye"));
}