imp: various fixes from clippy run

kbknapp · Nov 4, 2015 · b8b633f · b8b633f
1 parent b82219e
commit b8b633f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -47,7 +47,7 @@ impl Display for CliError {
 }
 
 impl Error for CliError {
-    fn description<'a>(&'a self) -> &'a str {
+    fn description(&self) -> &str {
         match *self {
             CliError::Generic(ref d) => &*d,
             CliError::FileOpen(ref d) => &*d,

diff --git a/src/lockfile.rs b/src/lockfile.rs
@@ -107,6 +107,7 @@ impl Lockfile {
                                       pwd.display())))
     }
 
+    #[cfg_attr(feature = "lints", allow(str_to_string))]
     pub fn get_updates(&mut self, cfg: &Config) -> CliResult<Option<HashMap<String, Dep>>> {
         try!(self.parse_deps_to_depth(cfg.depth));
 
@@ -326,7 +327,7 @@ impl Lockfile {
     }
 
 
-    fn parse_deps_to_depth<'a>(&'a mut self, mut depth: i32) -> CliResult<()> {
+    fn parse_deps_to_depth(&mut self, mut depth: i32) -> CliResult<()> {
         debugln!("executing; parse_deps_to_depth; depth={}", depth);
         let mut all_deps = depth == 0;
 

diff --git a/src/main.rs b/src/main.rs
@@ -76,12 +76,12 @@
 #![cfg_attr(feature = "lints", allow(explicit_iter_loop))]
 #![cfg_attr(feature = "lints", allow(should_implement_trait))]
 #![cfg_attr(feature = "lints", deny(warnings))]
+#![cfg_attr(not(any(feature = "unstable", feature = "nightly")), deny(unstable_features))]
 #![deny(missing_docs,
         missing_debug_implementations,
         missing_copy_implementations,
         trivial_casts, trivial_numeric_casts,
         unsafe_code,
-        unstable_features,
         unused_import_braces,
         unused_qualifications)]