Merge #1044

1044: use tool_lints feature and migrate clippy warnings to have clippy:: prefix r=Xanewok a=matthiaskrgr



Co-authored-by: Matthias Krüger <[email protected]>

Author: bors-voyager[bot]

src/actions/hover.rs

@@ -720,8 +720,11 @@ fn racer_def(ctx: &InitActionContext, span: &Span<ZeroIndexed>) -> Option<Def> {
         trace!("racer_def: match: {:?}", racer_match);
         racer_match
             // Avoid creating tooltip text that is exactly the item being hovered over
-            .filter(|m| name.as_ref().map(|name| name != &m.contextstr).unwrap_or(true))
-            .and_then(|m| racer_match_to_def(ctx, &m))
+            .filter(|m| {
+                name.as_ref()
+                    .map(|name| name != &m.contextstr)
+                    .unwrap_or(true)
+            }).and_then(|m| racer_match_to_def(ctx, &m))
     });
 
     let results = results.map_err(|_| {
@@ -932,7 +935,7 @@ pub fn tooltip(
 }
 
 #[cfg(test)]
-#[allow(expect_fun_call)]
+#[allow(clippy::expect_fun_call)]
 pub mod test {
     use super::*;
 

src/build/rustc.rs

@@ -229,7 +229,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
             .late_callback(codegen_backend, matches, sess, cstore, input, odir, ofile)
     }
 
-    #[allow(boxed_local)] // https://github.com/rust-lang-nursery/rust-clippy/issues/1123
+    #[allow(clippy::boxed_local)] // https://github.com/rust-lang-nursery/rust-clippy/issues/1123
     fn build_controller(
         self: Box<Self>,
         sess: &Session,

src/main.rs

@@ -15,14 +15,14 @@
 //! functionality such as 'goto definition', symbol search, reformatting, and
 //! code completion, and enables renaming and refactorings.
 
-#![feature(rustc_private, integer_atomics, drain_filter)]
+#![feature(rustc_private, integer_atomics, drain_filter, tool_lints)]
 #![feature(crate_visibility_modifier)] // needed for edition 2018
 #![allow(unknown_lints)]
-#![warn(clippy, rust_2018_idioms)]
+#![warn(clippy::all, rust_2018_idioms)]
 #![allow(
-    cyclomatic_complexity,
-    needless_pass_by_value,
-    too_many_arguments
+    clippy::cyclomatic_complexity,
+    clippy::needless_pass_by_value,
+    clippy::too_many_arguments
 )]
 // See rustc/rustc.rs in rust repo for explanation of stack adjustments.
 #![feature(link_args)]

src/server/dispatch.rs

@@ -36,7 +36,7 @@ pub const DEFAULT_REQUEST_TIMEOUT: Duration = Duration::from_millis(3_600_000);
 /// Macro enum `DispatchRequest` packing in various similar `Request` types
 macro_rules! define_dispatch_request_enum {
     ($($request_type:ident),*$(,)*) => {
-        #[allow(large_enum_variant)] // seems ok for a short lived macro-enum
+        #[allow(clippy::large_enum_variant)] // seems ok for a short lived macro-enum
         crate enum DispatchRequest {
             $(
                 $request_type(Request<$request_type>),

src/test/harness.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(expect_fun_call)]
+#![allow(clippy::expect_fun_call)]
 
 use std::collections::HashMap;
 use std::env;