Merge pull request #468 from EPashkin/clippy

Fix some clippy warnings

Author: sdroege

.travis.yml

@@ -55,6 +55,10 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig; fi
   - if [[ "$ARM" == "1" ]]; then rustup target add armv7-unknown-linux-gnueabihf; fi
 script:
+  - if [ "$TRAVIS_RUST_VERSION" == "beta" ]; then
+    rustup component add clippy;
+    cargo clippy --release;
+    fi
   - if [ "$TRAVIS_RUST_VERSION" == "nightly" ] && [ "$GTK" == "3.14" ] && ! [ "$ARM" == "1" ]; then
     make regen_check;
     fi

src/closure.rs

@@ -82,6 +82,7 @@ impl Closure {
         from_glib_none(closure)
     }
 
+    #[allow(clippy::redundant_closure)]
     pub fn invoke(&self, values: &[&ToValue]) -> Option<Value> {
         let mut result = unsafe { Value::uninitialized() };
 

src/error.rs

@@ -83,12 +83,6 @@ impl Error {
             })
         }
     }
-
-    // backcompat shim
-    #[cfg_attr(feature = "cargo-clippy", allow(not_unsafe_ptr_arg_deref))]
-    pub fn wrap(ptr: *mut glib_ffi::GError) -> Error {
-        unsafe { from_glib_full(ptr) }
-    }
 }
 
 impl fmt::Display for Error {

src/file_error.rs

@@ -72,7 +72,7 @@ impl ErrorDomain for FileError {
         }
     }
 
-    #[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
+    #[allow(clippy::cyclomatic_complexity)]
     fn from(code: i32) -> Option<Self> {
         use self::FileError::*;
         match code {

src/gobject/mod.rs

@@ -4,7 +4,6 @@
 
 //! GObject bindings
 
-#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 pub mod auto;
 
 pub use self::auto::*;

src/key_file.rs

@@ -48,7 +48,7 @@ impl KeyFile {
     pub fn load_from_dirs<T: AsRef<std::path::Path>, U: AsRef<std::path::Path>>(&self, file: T, search_dirs: &[U],
                                                      flags: KeyFileFlags) -> Result<path::PathBuf, Error> {
         unsafe {
-            let search_dirs: Vec<&std::path::Path> = search_dirs.iter().map(|p| p.as_ref()).collect();
+            let search_dirs: Vec<&std::path::Path> = search_dirs.iter().map(AsRef::as_ref).collect();
             let mut error = ptr::null_mut();
             let mut full_path: *mut libc::c_char = ptr::null_mut();
             let _ = ffi::g_key_file_load_from_dirs(self.to_glib_none().0,

src/lib.rs

@@ -75,7 +75,8 @@
 //! conversions between high level Rust types (including the aforementioned
 //! wrappers) and their FFI counterparts.
 
-#![cfg_attr(feature = "cargo-clippy", allow(doc_markdown))]
+#![allow(clippy::doc_markdown)]
+#![allow(clippy::unreadable_literal)]
 
 #[macro_use]
 extern crate bitflags;
@@ -164,9 +165,9 @@ pub mod object;
 
 pub use auto::*;
 pub use auto::functions::*;
-#[cfg_attr(feature = "cargo-clippy", allow(let_and_return))]
-#[cfg_attr(feature = "cargo-clippy", allow(let_unit_value))]
-#[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#[allow(clippy::let_and_return)]
+#[allow(clippy::let_unit_value)]
+#[allow(clippy::too_many_arguments)]
 #[allow(non_upper_case_globals)]
 mod auto;
 

src/main_context.rs

@@ -4,7 +4,6 @@
 
 use ffi;
 use translate::*;
-use std::mem::transmute;
 use std::mem;
 use ffi as glib_ffi;
 use ffi::{gpointer, gboolean};
@@ -96,9 +95,8 @@ impl MainContext {
     }
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 unsafe extern "C" fn trampoline<F: FnOnce() + 'static>(func: gpointer) -> gboolean {
-    let func: &mut Option<F> = transmute(func);
+    let func: &mut Option<F> = &mut *(func as *mut Option<F>);
     let func = func.take().expect("MainContext::invoke() closure called multiple times");
     func();
     glib_ffi::G_SOURCE_REMOVE

src/main_context_channel.rs

@@ -496,16 +496,14 @@ impl<T> Receiver<T> {
             }
 
             let source = Source::from_glib_full(mut_override(&(*source).source));
-            let id = if let Some(context) = context {
+            if let Some(context) = context {
                 assert!(context.is_owner());
                 source.attach(Some(context))
             } else {
                 let context = MainContext::ref_thread_default();
                 assert!(context.is_owner());
                 source.attach(Some(&context))
-            };
-
-            id
+            }
         }
     }
 }

src/main_context_futures.rs

@@ -28,6 +28,7 @@ const NOT_READY: usize = 1;
 const READY: usize = 2;
 const DONE: usize = 3;
 
+#[allow(clippy::type_complexity)]
 #[repr(C)]
 struct TaskSource {
     source: glib_ffi::GSource,
@@ -138,6 +139,7 @@ static SOURCE_FUNCS: glib_ffi::GSourceFuncs = glib_ffi::GSourceFuncs {
 };
 
 impl TaskSource {
+    #[allow(clippy::new_ret_no_self)]
     fn new(
         priority: Priority,
         future: Box<Future<Item = (), Error = Never> + 'static + Send>,
@@ -275,6 +277,7 @@ impl MainContext {
     ///
     /// This must only be called if no `MainLoop` or anything else is running on this specific main
     /// context.
+    #[allow(clippy::transmute_ptr_to_ptr)]
     pub fn block_on<F: Future>(&self, f: F) -> Result<F::Item, F::Error> {
         let mut res = None;
         let l = MainLoop::new(Some(&*self), false);