Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 5afa4fb

Browse files
authoredAug 29, 2018
Merge pull request #1024 from Xanewok/unused-log
Remove unnecessary now imports of inner log::log macros
2 parents 8ce3d48 + 96566d1 commit 5afa4fb

File tree

18 files changed

+18
-19
lines changed

18 files changed

+18
-19
lines changed
 

‎src/actions/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use serde_json;
2424
use rls_span::compiler::DiagnosticSpan;
2525
use url::Url;
2626
use serde_derive::Deserialize;
27-
use log::{debug, log};
27+
use log::debug;
2828

2929
pub use languageserver_types::Diagnostic;
3030

‎src/actions/format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use std::path::{Path, PathBuf};
1818
use std::process::{Command, Stdio};
1919

2020
use rand::{Rng, thread_rng};
21-
use log::{log, debug};
21+
use log::debug;
2222
use rustfmt_nightly::{Config, Session, Input};
2323
use serde_json;
2424

‎src/actions/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use url::Url;
2020
use rls_span as span;
2121
use crate::Span;
2222
use walkdir::WalkDir;
23-
use log::{debug, log, trace, error, info};
23+
use log::{debug, trace, error, info};
2424

2525
use crate::actions::format::Rustfmt;
2626
use crate::actions::post_build::{BuildResults, PostBuildHandler, AnalysisQueue};
@@ -46,7 +46,6 @@ use std::io;
4646
macro_rules! ignore_non_file_uri {
4747
($expr: expr, $uri: expr, $log_name: expr) => {
4848
$expr.map_err(|_| {
49-
use log::{log, trace};
5049
trace!("{}: Non-`file` URI scheme, ignoring: {:?}", $log_name, $uri);
5150
()
5251
})

‎src/actions/notifications.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use serde::de::Error;
1818
use serde_json;
1919
use crate::Span;
2020
use std::sync::atomic::Ordering;
21-
use log::{debug, log, trace, warn};
21+
use log::{debug, trace, warn};
2222

2323
use crate::build::*;
2424
use crate::lsp_data::*;

‎src/actions/post_build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::lsp_data::PublishDiagnosticsParams;
2828
use crate::concurrency::JobToken;
2929
use languageserver_types::DiagnosticSeverity;
3030
use itertools::Itertools;
31-
use log::{log, trace};
31+
use log::trace;
3232

3333
use rls_analysis::AnalysisHost;
3434
use rls_data::Analysis;

‎src/actions/requests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use serde_json;
2020
use rls_span as span;
2121
use itertools::Itertools;
2222
use serde_derive::{Serialize, Deserialize};
23-
use log::{debug, log, trace};
23+
use log::{debug, trace};
2424

2525
use crate::actions::hover;
2626
use crate::actions::work_pool;

‎src/actions/run.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use regex::Regex;
44
use rls_span::{Column, Position, Range, Row, ZeroIndexed};
55
use rls_vfs::FileContents;
66
use lazy_static::lazy_static;
7-
use log::{log, error};
7+
use log::error;
88
use serde_derive::Serialize;
99

1010
use std::{collections::HashMap, iter, path::Path};

‎src/actions/work_pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::{fmt, panic};
44
use std::time::{Duration, Instant};
55
use std::sync::{mpsc, Mutex};
66
use lazy_static::lazy_static;
7-
use log::{info, log, warn};
7+
use log::{info, warn};
88

99
/// Description of work on the request work pool. Equality implies two pieces of work are the same
1010
/// kind of thing. The `str` should be human readable for logging, ie the language server protocol

‎src/build/cargo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::build::plan::Plan;
2323
use crate::build::environment::{self, Environment, EnvironmentLock};
2424
use crate::config::Config;
2525
use rls_vfs::Vfs;
26-
use log::{debug, error, log, trace, warn};
26+
use log::{debug, error, trace, warn};
2727

2828
use std::collections::{BTreeMap, HashMap, HashSet};
2929
use std::env;

‎src/build/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use cargo::util::important_paths;
1818
use crate::config::Config;
1919
use rls_data::Analysis;
2020
use rls_vfs::Vfs;
21-
use log::{log, trace};
21+
use log::trace;
2222

2323
use self::environment::EnvironmentLock;
2424

‎src/build/plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use cargo::util::{CargoResult, ProcessBuilder};
3939
use cargo_metadata;
4040
use crate::lsp_data::parse_file_path;
4141
use url::Url;
42-
use log::{log, trace, error};
42+
use log::{trace, error};
4343

4444
use crate::actions::progress::ProgressUpdate;
4545
use super::{BuildResult, Internals};

‎src/build/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use syntax::ast;
2222
use syntax::source_map::{FileLoader, RealFileLoader};
2323
use rls_data::Analysis;
2424
use rls_vfs::Vfs;
25-
use log::{log, trace};
25+
use log::trace;
2626

2727
use crate::config::{ClippyPreference, Config};
2828
use crate::build::{BufWriter, BuildResult};

‎src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use cargo::core::{Shell, Workspace};
2626
use serde::de::{Deserialize, Deserializer, Visitor};
2727
use serde_derive::{Serialize, Deserialize};
2828

29-
use log::{log, trace};
29+
use log::trace;
3030

3131
use rustfmt_nightly::Config as RustfmtConfig;
3232
use rustfmt_nightly::{load_config, CliOptions, EmitMode, Verbosity};

‎src/project_model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::{
55
sync::Arc,
66
path::{Path, PathBuf},
77
};
8-
use log::{log, warn};
8+
use log::warn;
99
use rls_vfs::{Vfs, FileContents};
1010
use cargo::{
1111
Config,

‎src/server/dispatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::server::io::Output;
1919
use crate::server::message::ResponseError;
2020
use crate::server::{Request, Response};
2121
use crate::concurrency::{ConcurrentJob, JobToken};
22-
use log::{debug, log};
22+
use log::debug;
2323
use std::sync::mpsc;
2424
use std::thread;
2525
use std::time::Duration;

‎src/server/io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use serde;
1212
use serde_json;
13-
use log::{debug, trace, log};
13+
use log::{debug, trace};
1414

1515
use super::{Notification, Request, RequestId};
1616
use crate::lsp_data::{LSPNotification, LSPRequest};

‎src/server/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use serde::ser::{Serialize, SerializeStruct, Serializer};
1717
use serde::Deserialize;
1818
use serde_json;
1919
use serde_derive::Serialize;
20-
use log::{debug, log};
20+
use log::debug;
2121

2222
use crate::actions::ActionContext;
2323
use crate::lsp_data::{LSPNotification, LSPRequest};

‎src/server/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use std::sync::atomic::Ordering;
4040
use std::sync::{Arc, Mutex};
4141
use crate::version;
4242
use rls_vfs::Vfs;
43-
use log::{debug, error, log, trace, warn};
43+
use log::{debug, error, trace, warn};
4444

4545
mod dispatch;
4646
mod io;

0 commit comments

Comments
 (0)