Remove unnecessary now imports of inner log::log macros

src/actions/diagnostics.rs

@@ -24,7 +24,7 @@ use serde_json;
 use rls_span::compiler::DiagnosticSpan;
 use url::Url;
 use serde_derive::Deserialize;
-use log::{debug, log};
+use log::debug;
 
 pub use languageserver_types::Diagnostic;
 

src/actions/format.rs

@@ -18,7 +18,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
 use rand::{Rng, thread_rng};
-use log::{log, debug};
+use log::debug;
 use rustfmt_nightly::{Config, Session, Input};
 use serde_json;
 

src/actions/mod.rs

@@ -20,7 +20,7 @@ use url::Url;
 use rls_span as span;
 use crate::Span;
 use walkdir::WalkDir;
-use log::{debug, log, trace, error, info};
+use log::{debug, trace, error, info};
 
 use crate::actions::format::Rustfmt;
 use crate::actions::post_build::{BuildResults, PostBuildHandler, AnalysisQueue};
@@ -46,7 +46,6 @@ use std::io;
 macro_rules! ignore_non_file_uri {
     ($expr: expr, $uri: expr, $log_name: expr) => {
         $expr.map_err(|_| {
-            use log::{log, trace};
             trace!("{}: Non-`file` URI scheme, ignoring: {:?}", $log_name, $uri);
             ()
         })

src/actions/notifications.rs

@@ -18,7 +18,7 @@ use serde::de::Error;
 use serde_json;
 use crate::Span;
 use std::sync::atomic::Ordering;
-use log::{debug, log, trace, warn};
+use log::{debug, trace, warn};
 
 use crate::build::*;
 use crate::lsp_data::*;

src/actions/post_build.rs

@@ -28,7 +28,7 @@ use crate::lsp_data::PublishDiagnosticsParams;
 use crate::concurrency::JobToken;
 use languageserver_types::DiagnosticSeverity;
 use itertools::Itertools;
-use log::{log, trace};
+use log::trace;
 
 use rls_analysis::AnalysisHost;
 use rls_data::Analysis;

src/actions/requests.rs

@@ -20,7 +20,7 @@ use serde_json;
 use rls_span as span;
 use itertools::Itertools;
 use serde_derive::{Serialize, Deserialize};
-use log::{debug, log, trace};
+use log::{debug, trace};
 
 use crate::actions::hover;
 use crate::actions::work_pool;

src/actions/run.rs

@@ -4,7 +4,7 @@ use regex::Regex;
 use rls_span::{Column, Position, Range, Row, ZeroIndexed};
 use rls_vfs::FileContents;
 use lazy_static::lazy_static;
-use log::{log, error};
+use log::error;
 use serde_derive::Serialize;
 
 use std::{collections::HashMap, iter, path::Path};

src/actions/work_pool.rs

@@ -4,7 +4,7 @@ use std::{fmt, panic};
 use std::time::{Duration, Instant};
 use std::sync::{mpsc, Mutex};
 use lazy_static::lazy_static;
-use log::{info, log, warn};
+use log::{info, warn};
 
 /// Description of work on the request work pool. Equality implies two pieces of work are the same
 /// kind of thing. The `str` should be human readable for logging, ie the language server protocol

src/build/cargo.rs

@@ -23,7 +23,7 @@ use crate::build::plan::Plan;
 use crate::build::environment::{self, Environment, EnvironmentLock};
 use crate::config::Config;
 use rls_vfs::Vfs;
-use log::{debug, error, log, trace, warn};
+use log::{debug, error, trace, warn};
 
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::env;

src/build/mod.rs

@@ -18,7 +18,7 @@ use cargo::util::important_paths;
 use crate::config::Config;
 use rls_data::Analysis;
 use rls_vfs::Vfs;
-use log::{log, trace};
+use log::trace;
 
 use self::environment::EnvironmentLock;
 

src/build/plan.rs

@@ -39,7 +39,7 @@ use cargo::util::{CargoResult, ProcessBuilder};
 use cargo_metadata;
 use crate::lsp_data::parse_file_path;
 use url::Url;
-use log::{log, trace, error};
+use log::{trace, error};
 
 use crate::actions::progress::ProgressUpdate;
 use super::{BuildResult, Internals};

src/build/rustc.rs

@@ -22,7 +22,7 @@ use syntax::ast;
 use syntax::source_map::{FileLoader, RealFileLoader};
 use rls_data::Analysis;
 use rls_vfs::Vfs;
-use log::{log, trace};
+use log::trace;
 
 use crate::config::{ClippyPreference, Config};
 use crate::build::{BufWriter, BuildResult};

src/config.rs

@@ -26,7 +26,7 @@ use cargo::core::{Shell, Workspace};
 use serde::de::{Deserialize, Deserializer, Visitor};
 use serde_derive::{Serialize, Deserialize};
 
-use log::{log, trace};
+use log::trace;
 
 use rustfmt_nightly::Config as RustfmtConfig;
 use rustfmt_nightly::{load_config, CliOptions, EmitMode, Verbosity};

src/project_model.rs

@@ -5,7 +5,7 @@ use std::{
     sync::Arc,
     path::{Path, PathBuf},
 };
-use log::{log, warn};
+use log::warn;
 use rls_vfs::{Vfs, FileContents};
 use cargo::{
     Config,

src/server/dispatch.rs

@@ -19,7 +19,7 @@ use crate::server::io::Output;
 use crate::server::message::ResponseError;
 use crate::server::{Request, Response};
 use crate::concurrency::{ConcurrentJob, JobToken};
-use log::{debug, log};
+use log::debug;
 use std::sync::mpsc;
 use std::thread;
 use std::time::Duration;

src/server/io.rs

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

src/server/message.rs

@@ -17,7 +17,7 @@ use serde::ser::{Serialize, SerializeStruct, Serializer};
 use serde::Deserialize;
 use serde_json;
 use serde_derive::Serialize;
-use log::{debug, log};
+use log::debug;
 
 use crate::actions::ActionContext;
 use crate::lsp_data::{LSPNotification, LSPRequest};

src/server/mod.rs

@@ -40,7 +40,7 @@ use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 use crate::version;
 use rls_vfs::Vfs;
-use log::{debug, error, log, trace, warn};
+use log::{debug, error, trace, warn};
 
 mod dispatch;
 mod io;