Merge branch 'master' of https://github.com/Manishearth/rust-clippy into rustup

src/lib.rs

@@ -101,7 +101,6 @@ pub fn plugin_registrar(reg: &mut Registry) {
         methods::WRONG_PUB_SELF_CONVENTION,
         mut_mut::MUT_MUT,
         mutex_atomic::MUTEX_INTEGER,
-        ptr_arg::PTR_ARG,
         shadow::SHADOW_REUSE,
         shadow::SHADOW_SAME,
         shadow::SHADOW_UNRELATED,
@@ -153,6 +152,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
         needless_bool::NEEDLESS_BOOL,
         open_options::NONSENSICAL_OPEN_OPTIONS,
         precedence::PRECEDENCE,
+        ptr_arg::PTR_ARG,
         ranges::RANGE_STEP_BY_ZERO,
         returns::LET_AND_RETURN,
         returns::NEEDLESS_RETURN,

src/ptr_arg.rs

@@ -1,6 +1,6 @@
 //! Checks for usage of &Vec[_] and &String
 //!
-//! This lint is **allow** by default
+//! This lint is **warn** by default
 
 use rustc::lint::*;
 use rustc_front::hir::*;
@@ -11,7 +11,7 @@ use utils::{STRING_PATH, VEC_PATH};
 
 declare_lint! {
     pub PTR_ARG,
-    Allow,
+    Warn,
     "fn arguments of the type `&Vec<...>` or `&String`, suggesting to use `&[...]` or `&str` \
      instead, respectively"
 }