From 1834bae5b86c54ed9dece26e82436919d59e6cb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 4 Jul 2019 23:05:17 +0300 Subject: allow rustfmt to reorder imports This wasn't a right decision in the first place, the feature flag was broken in the last rustfmt release, and syntax highlighting of imports is more important anyway --- crates/ra_lsp_server/tests/heavy_tests/main.rs | 12 +++++------- crates/ra_lsp_server/tests/heavy_tests/support.rs | 9 +++------ 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'crates/ra_lsp_server/tests/heavy_tests') diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 40d825893..d271b02fc 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs @@ -1,16 +1,14 @@ mod support; -use std::{ - collections::HashMap, - time::Instant, -}; +use std::{collections::HashMap, time::Instant}; use lsp_types::{ - CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range, DidOpenTextDocumentParams, TextDocumentItem, TextDocumentPositionParams + CodeActionContext, DidOpenTextDocumentParams, DocumentFormattingParams, FormattingOptions, + Position, Range, TextDocumentItem, TextDocumentPositionParams, }; use ra_lsp_server::req::{ - CodeActionParams, CodeActionRequest, Formatting, Runnables, RunnablesParams, CompletionParams, Completion, - DidOpenTextDocument, OnEnter, + CodeActionParams, CodeActionRequest, Completion, CompletionParams, DidOpenTextDocument, + Formatting, OnEnter, Runnables, RunnablesParams, }; use serde_json::json; use tempfile::TempDir; diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index 75912afdd..a5e352da1 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs @@ -11,20 +11,17 @@ use flexi_logger::Logger; use gen_lsp_server::{RawMessage, RawNotification, RawRequest}; use lsp_types::{ notification::DidOpenTextDocument, + notification::{Notification, ShowMessage}, request::{Request, Shutdown}, DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, - notification::{Notification, ShowMessage}, }; use serde::Serialize; use serde_json::{to_string_pretty, Value}; use tempfile::TempDir; +use test_utils::{find_mismatch, parse_fixture}; use thread_worker::Worker; -use test_utils::{parse_fixture, find_mismatch}; -use ra_lsp_server::{ - main_loop, req, - InitializationOptions, -}; +use ra_lsp_server::{main_loop, req, InitializationOptions}; pub struct Project<'a> { fixture: &'a str, -- cgit v1.2.3