Skip to content

Commit

Permalink
Fix all clippy lints
Browse files Browse the repository at this point in the history
  • Loading branch information
alanhdu committed Oct 16, 2018
1 parent a3b537d commit b701838
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
12 changes: 6 additions & 6 deletions crates/gen_lsp_server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
//! let (receiver, sender, io_threads) = stdio_transport();
//! gen_lsp_server::run_server(
//! ServerCapabilities::default(),
//! receiver,
//! sender,
//! &receiver,
//! &sender,
//! main_loop,
//! )?;
//! io_threads.join()?;
Expand Down Expand Up @@ -94,14 +94,14 @@ pub use {
/// request.
pub fn run_server(
caps: ServerCapabilities,
receiver: Receiver<RawMessage>,
sender: Sender<RawMessage>,
receiver: &Receiver<RawMessage>,
sender: &Sender<RawMessage>,
server: impl FnOnce(InitializeParams, &Receiver<RawMessage>, &Sender<RawMessage>) -> Result<()>,
) -> Result<()> {
info!("lsp server initializes");
let params = initialize(&receiver, &sender, caps)?;
let params = initialize(receiver, sender, caps)?;
info!("lsp server initialized, serving requests");
server(params, &receiver, &sender)?;
server(params, receiver, sender)?;
info!("lsp server waiting for exit notification");
match receiver.recv() {
Some(RawMessage::Notification(n)) => n
Expand Down
2 changes: 1 addition & 1 deletion crates/gen_lsp_server/src/msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl RawRequest {
R::Params: Serialize,
{
RawRequest {
id: id,
id,
method: R::METHOD.to_string(),
params: to_value(params).unwrap(),
}
Expand Down
4 changes: 2 additions & 2 deletions crates/ra_lsp_server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ fn main_inner() -> Result<()> {
let cwd = ::std::env::current_dir()?;
run_server(
ra_lsp_server::server_capabilities(),
receiver,
sender,
&receiver,
&sender,
|params, r, s| {
let root = params
.root_uri
Expand Down
1 change: 1 addition & 0 deletions crates/ra_lsp_server/src/main_loop/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ pub fn main_loop(
Ok(())
}

#[cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))]
fn main_loop_inner(
internal_mode: bool,
ws_root: PathBuf,
Expand Down

0 comments on commit b701838

Please sign in to comment.