Merge pull request #1638 from matthiaskrgr/clippy_5

fix clippy warnings

Author: Xanewok

rls-rustc/src/ipc.rs

@@ -23,12 +23,12 @@ impl From<RpcChannel> for Client {
 pub struct IpcFileLoader(FileLoaderClient);
 
 impl IpcFileLoader {
-    pub fn into_boxed(self) -> Option<Box<dyn syntax::source_map::FileLoader + Send + Sync>> {
+    pub fn into_boxed(self) -> Option<Box<dyn rustc_span::source_map::FileLoader + Send + Sync>> {
         Some(Box::new(self))
     }
 }
 
-impl syntax::source_map::FileLoader for IpcFileLoader {
+impl rustc_span::source_map::FileLoader for IpcFileLoader {
     fn file_exists(&self, path: &Path) -> bool {
         self.0.file_exists(path.to_owned()).wait().unwrap()
     }

rls-rustc/src/lib.rs

@@ -135,8 +135,8 @@ impl Callbacks for ShimCalls {
             src_path,
             disambiguator: sess.local_crate_disambiguator().to_fingerprint().as_value(),
             edition: match sess.edition() {
-                syntax::edition::Edition::Edition2015 => Edition::Edition2015,
-                syntax::edition::Edition::Edition2018 => Edition::Edition2018,
+                rustc_span::edition::Edition::Edition2015 => Edition::Edition2015,
+                rustc_span::edition::Edition::Edition2018 => Edition::Edition2018,
             },
         };
 

rls/src/actions/diagnostics.rs

@@ -15,7 +15,6 @@ use lsp_types::{
 };
 use rls_span::compiler::DiagnosticSpan;
 use serde_derive::Deserialize;
-use serde_json;
 use url::Url;
 
 pub use lsp_types::Diagnostic;
@@ -598,12 +597,6 @@ help: consider borrowing here: `&string`"#,
         assert!(messages[0].1.is_empty(), "{:?}", messages[0].1);
     }
 
-    /// ```
-    /// fn main() {
-    ///     let mut out = String::new();
-    ///     write!(out, "{}", 123);
-    /// }
-    /// ```
     #[test]
     fn macro_error_no_trait() {
         let diag = parse_compiler_message(

rls/src/actions/format.rs

@@ -13,7 +13,6 @@ use log::debug;
 use lsp_types::{Position, Range, TextEdit};
 use rand::{distributions, thread_rng, Rng};
 use rustfmt_nightly::{Config, Input, ModifiedLines, NewlineStyle, Session};
-use serde_json;
 
 /// Specifies which `rustfmt` to use.
 #[derive(Clone)]

rls/src/actions/hover.rs

@@ -1,8 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use home;
 use log::*;
-use racer;
 use rls_analysis::{Def, DefKind};
 use rls_span::{Column, Range, Row, Span, ZeroIndexed};
 use rls_vfs::{self as vfs, Vfs};

rls/src/actions/requests.rs

@@ -7,14 +7,12 @@ use std::sync::atomic::Ordering;
 use itertools::Itertools;
 use jsonrpc_core::types::ErrorCode;
 use log::{debug, trace, warn};
-use racer;
 use rls_analysis::SymbolQuery;
 use rls_data as data;
 use rls_span as span;
 use rls_vfs::FileContents;
 use rustfmt_nightly::{Edition as RustfmtEdition, FileLines, FileName, Range as RustfmtRange};
 use serde_derive::{Deserialize, Serialize};
-use serde_json;
 use url::Url;
 
 use crate::actions::hover;
@@ -269,7 +267,7 @@ impl RequestAction for Completion {
             .map(|comp| {
                 let mut item = completion_item_from_racer_match(&comp);
                 if is_use_stmt && comp.mtype.is_function() {
-                    item.insert_text = Some(comp.matchstr.to_string());
+                    item.insert_text = Some(comp.matchstr);
                 } else if code_completion_has_snippet_support {
                     let snippet = racer::snippet_for_match(&comp, &session);
                     if !snippet.is_empty() {

rls/src/actions/work_pool.rs

@@ -1,7 +1,6 @@
 use crate::server::DEFAULT_REQUEST_TIMEOUT;
 use lazy_static::lazy_static;
 use log::{info, warn};
-use rayon;
 use std::sync::{mpsc, Mutex};
 use std::time::{Duration, Instant};
 use std::{fmt, panic};

rls/src/build/cargo.rs

@@ -23,7 +23,6 @@ use cargo::util::{
 use log::{debug, trace, warn};
 use rls_data::Analysis;
 use rls_vfs::Vfs;
-use serde_json;
 
 use crate::actions::progress::ProgressUpdate;
 use crate::build::cargo_plan::CargoPlan;

rls/src/build/cargo_plan.rs

@@ -23,7 +23,6 @@ use cargo::core::compiler::{CompileKind, CompileMode, Context, Unit};
 use cargo::core::profiles::Profile;
 use cargo::core::{PackageId, Target, TargetKind};
 use cargo::util::ProcessBuilder;
-use cargo_metadata;
 use log::{error, trace};
 
 use crate::build::plan::{BuildGraph, BuildKey, JobQueue, WorkStatus};

rls/src/build/external.rs

@@ -229,7 +229,7 @@ impl Invocation {
         Invocation {
             deps: raw.deps.to_owned(),
             outputs: raw.outputs.to_owned(),
-            links: raw.links.to_owned(),
+            links: raw.links,
             src_path: guess_rustc_src_path(build_dir, &command),
             command,
         }

rls/src/build/rustc.rs

@@ -264,7 +264,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
         .and_then(|path| src_path(Some(cwd), path));
 
         let krate = Crate {
-            name: crate_name.to_owned(),
+            name: crate_name,
             src_path,
             disambiguator: sess.local_crate_disambiguator().to_fingerprint().as_value(),
             edition: match sess.edition() {

rls/src/config.rs

@@ -253,7 +253,7 @@ impl Config {
                         deprecated.push(snake_case.clone());
                     }
 
-                    Some((snake_case, JsonValue(v.to_owned().clone())))
+                    Some((snake_case, JsonValue(v.to_owned())))
                 } else {
                     None
                 }

rls/src/lsp_data.rs

@@ -7,7 +7,6 @@ use std::path::PathBuf;
 pub use lsp_types::notification::Notification as LSPNotification;
 pub use lsp_types::request::Request as LSPRequest;
 pub use lsp_types::*;
-use racer;
 use rls_analysis::DefKind;
 use rls_span as span;
 use serde_derive::{Deserialize, Serialize};

rls/src/project_model.rs

@@ -11,7 +11,6 @@ use cargo::{
     Config,
 };
 use log::warn;
-use racer;
 use rls_vfs::{FileContents, Vfs};
 use std::{
     collections::HashMap,

rls/src/server/io.rs

@@ -1,6 +1,4 @@
 use log::{debug, trace};
-use serde;
-use serde_json;
 
 use super::{Notification, Request, RequestId};
 use crate::lsp_data::{LSPNotification, LSPRequest};

rls/src/server/message.rs

@@ -7,11 +7,9 @@ use std::time::Instant;
 use jsonrpc_core::{self as jsonrpc, Id};
 use log::debug;
 use lsp_types::notification::ShowMessage;
-use serde;
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 use serde::Deserialize;
 use serde_derive::Serialize;
-use serde_json;
 
 use crate::actions::{ActionContext, InitActionContext};
 use crate::lsp_data::{LSPNotification, LSPRequest, MessageType, ShowMessageParams, WorkspaceEdit};

rls/src/server/mod.rs

@@ -132,7 +132,7 @@ pub(crate) fn maybe_notify_duplicated_configs<O: Output>(
     }
     out.notify(Notification::<ShowMessage>::new(ShowMessageParams {
         typ: MessageType::Warning,
-        message: format!("Duplicated RLS configuration: {}", msg.clone()),
+        message: format!("Duplicated RLS configuration: {}", msg),
     }));
 }
 

tests/client.rs

@@ -1361,9 +1361,7 @@ fn client_did_change_configuration_duplicated_and_unknown_settings() {
             "dup-licated": "dup-licated"
         }
     });
-    rls.notify::<DidChangeConfiguration>(DidChangeConfigurationParams {
-        settings: settings.clone(),
-    });
+    rls.notify::<DidChangeConfiguration>(DidChangeConfigurationParams { settings });
 
     rls.wait_for_message(is_notification_for_unknown_config);
     if !rls.messages().iter().any(is_notification_for_duplicated_config) {
@@ -1477,7 +1475,7 @@ fn client_hover_after_src_line_change() {
     let contents = ["&str", "let world = \"world\";"];
     let contents: Vec<_> = contents
         .iter()
-        .map(|value| LanguageString { language: "rust".to_string(), value: value.to_string() })
+        .map(|value| LanguageString { language: "rust".to_string(), value: (*value).to_string() })
         .map(MarkedString::LanguageString)
         .collect();
 
@@ -1914,7 +1912,7 @@ fn client_completion() {
         11,
         CompletionParams {
             text_document_position: TextDocumentPositionParams {
-                text_document: text_document.clone(),
+                text_document,
                 position: Position { line: 15, character: 30 },
             },
             context: None,

tests/support/harness.rs

@@ -8,13 +8,10 @@ use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
 
-use env_logger;
-use lsp_types;
 use rls::config::{Config, Inferrable};
 use rls::server as ls_server;
 use rls_analysis::{AnalysisHost, Target};
 use rls_vfs::Vfs;
-use serde_json;
 use walkdir::WalkDir;
 
 use super::fixtures_dir;