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_ide_api/src/completion/complete_dot.rs | 4 ++-- crates/ra_ide_api/src/completion/complete_fn_param.rs | 5 ++--- crates/ra_ide_api/src/completion/complete_keyword.rs | 9 ++++++--- crates/ra_ide_api/src/completion/complete_path.rs | 6 +++--- crates/ra_ide_api/src/completion/complete_pattern.rs | 2 +- crates/ra_ide_api/src/completion/complete_postfix.rs | 15 ++++----------- crates/ra_ide_api/src/completion/complete_scope.rs | 10 +++++----- crates/ra_ide_api/src/completion/complete_snippet.rs | 7 +++++-- .../ra_ide_api/src/completion/complete_struct_literal.rs | 2 +- crates/ra_ide_api/src/completion/completion_context.rs | 10 +++++----- crates/ra_ide_api/src/completion/completion_item.rs | 4 ++-- crates/ra_ide_api/src/completion/presentation.rs | 12 +++++------- 12 files changed, 41 insertions(+), 45 deletions(-) (limited to 'crates/ra_ide_api/src/completion') diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs index a97e876e9..a5f071442 100644 --- a/crates/ra_ide_api/src/completion/complete_dot.rs +++ b/crates/ra_ide_api/src/completion/complete_dot.rs @@ -1,4 +1,4 @@ -use hir::{Ty, AdtDef, TypeCtor}; +use hir::{AdtDef, Ty, TypeCtor}; use crate::completion::{CompletionContext, Completions}; use rustc_hash::FxHashSet; @@ -49,7 +49,7 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty #[cfg(test)] mod tests { - use crate::completion::{do_completion, CompletionKind, CompletionItem}; + use crate::completion::{do_completion, CompletionItem, CompletionKind}; use insta::assert_debug_snapshot_matches; fn do_ref_completion(code: &str) -> Vec { diff --git a/crates/ra_ide_api/src/completion/complete_fn_param.rs b/crates/ra_ide_api/src/completion/complete_fn_param.rs index d738ffc13..5a117c485 100644 --- a/crates/ra_ide_api/src/completion/complete_fn_param.rs +++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs @@ -1,11 +1,10 @@ use ra_syntax::{ algo::visit::{visitor_ctx, VisitorCtx}, - ast, - AstNode, + ast, AstNode, }; use rustc_hash::FxHashMap; -use crate::completion::{CompletionContext, Completions, CompletionKind, CompletionItem}; +use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions}; /// Complete repeated parameters, both name and type. For example, if all /// functions in a file have a `spam: &mut Spam` parameter, a completion with diff --git a/crates/ra_ide_api/src/completion/complete_keyword.rs b/crates/ra_ide_api/src/completion/complete_keyword.rs index cfb9fd6e8..034ed934d 100644 --- a/crates/ra_ide_api/src/completion/complete_keyword.rs +++ b/crates/ra_ide_api/src/completion/complete_keyword.rs @@ -1,11 +1,14 @@ use ra_syntax::{ algo::visit::{visitor, Visitor}, - AstNode, ast::{self, LoopBodyOwner}, - SyntaxKind::*, SyntaxToken, + AstNode, + SyntaxKind::*, + SyntaxToken, }; -use crate::completion::{CompletionContext, CompletionItem, Completions, CompletionKind, CompletionItemKind}; +use crate::completion::{ + CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions, +}; pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { // complete keyword "crate" in use stmt diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs index da8fb9d8e..29586cd1f 100644 --- a/crates/ra_ide_api/src/completion/complete_path.rs +++ b/crates/ra_ide_api/src/completion/complete_path.rs @@ -1,8 +1,8 @@ -use hir::{Resolution, Either}; +use hir::{Either, Resolution}; use ra_syntax::AstNode; use test_utils::tested_by; -use crate::completion::{Completions, CompletionContext}; +use crate::completion::{CompletionContext, Completions}; pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) { let path = match &ctx.path_prefix { @@ -78,7 +78,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) { mod tests { use test_utils::covers; - use crate::completion::{CompletionKind, do_completion, CompletionItem}; + use crate::completion::{do_completion, CompletionItem, CompletionKind}; use insta::assert_debug_snapshot_matches; fn do_reference_completion(code: &str) -> Vec { diff --git a/crates/ra_ide_api/src/completion/complete_pattern.rs b/crates/ra_ide_api/src/completion/complete_pattern.rs index 6655a05a7..f12dfcc17 100644 --- a/crates/ra_ide_api/src/completion/complete_pattern.rs +++ b/crates/ra_ide_api/src/completion/complete_pattern.rs @@ -27,8 +27,8 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { #[cfg(test)] mod tests { + use crate::completion::{do_completion, CompletionItem, CompletionKind}; use insta::assert_debug_snapshot_matches; - use crate::completion::{CompletionItem, CompletionKind, do_completion}; fn complete(code: &str) -> Vec { do_completion(code, CompletionKind::Reference) diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs index e20a12e2a..7042d8bff 100644 --- a/crates/ra_ide_api/src/completion/complete_postfix.rs +++ b/crates/ra_ide_api/src/completion/complete_postfix.rs @@ -1,18 +1,11 @@ use crate::{ completion::{ - completion_item::{ - Completions, - Builder, - CompletionKind, - }, completion_context::CompletionContext, + completion_item::{Builder, CompletionKind, Completions}, }, - CompletionItem -}; -use ra_syntax::{ - ast::AstNode, - TextRange + CompletionItem, }; +use ra_syntax::{ast::AstNode, TextRange}; use ra_text_edit::TextEditBuilder; fn postfix_snippet(ctx: &CompletionContext, label: &str, detail: &str, snippet: &str) -> Builder { @@ -58,7 +51,7 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) { #[cfg(test)] mod tests { - use crate::completion::{CompletionKind, check_completion}; + use crate::completion::{check_completion, CompletionKind}; fn check_snippet_completion(test_name: &str, code: &str) { check_completion(test_name, code, CompletionKind::Postfix); diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 0f8cfaae8..1ba871257 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -1,9 +1,9 @@ -use rustc_hash::FxHashMap; -use ra_text_edit::TextEditBuilder; -use ra_syntax::{SmolStr, ast, AstNode}; use ra_assists::auto_import; +use ra_syntax::{ast, AstNode, SmolStr}; +use ra_text_edit::TextEditBuilder; +use rustc_hash::FxHashMap; -use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionContext}; +use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions}; pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) { if ctx.is_trivial_path { @@ -121,7 +121,7 @@ impl ImportResolver { #[cfg(test)] mod tests { - use crate::completion::{CompletionKind, check_completion}; + use crate::completion::{check_completion, CompletionKind}; fn check_reference_completion(name: &str, code: &str) { check_completion(name, code, CompletionKind::Reference); diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs index e1df9e625..d2d364b57 100644 --- a/crates/ra_ide_api/src/completion/complete_snippet.rs +++ b/crates/ra_ide_api/src/completion/complete_snippet.rs @@ -1,4 +1,7 @@ -use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionItemKind, CompletionContext, completion_item::Builder}; +use crate::completion::{ + completion_item::Builder, CompletionContext, CompletionItem, CompletionItemKind, + CompletionKind, Completions, +}; fn snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder { CompletionItem::new(CompletionKind::Snippet, ctx.source_range(), label) @@ -36,7 +39,7 @@ fn ${1:feature}() { #[cfg(test)] mod tests { - use crate::completion::{CompletionKind, check_completion}; + use crate::completion::{check_completion, CompletionKind}; fn check_snippet_completion(name: &str, code: &str) { check_completion(name, code, CompletionKind::Snippet); diff --git a/crates/ra_ide_api/src/completion/complete_struct_literal.rs b/crates/ra_ide_api/src/completion/complete_struct_literal.rs index 1eeea58f6..35fb21113 100644 --- a/crates/ra_ide_api/src/completion/complete_struct_literal.rs +++ b/crates/ra_ide_api/src/completion/complete_struct_literal.rs @@ -27,8 +27,8 @@ pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionCon #[cfg(test)] mod tests { + use crate::completion::{do_completion, CompletionItem, CompletionKind}; use insta::assert_debug_snapshot_matches; - use crate::completion::{CompletionItem, CompletionKind, do_completion}; fn complete(code: &str) -> Vec { do_completion(code, CompletionKind::Reference) diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs index bda7d9bb2..55fdba50d 100644 --- a/crates/ra_ide_api/src/completion/completion_context.rs +++ b/crates/ra_ide_api/src/completion/completion_context.rs @@ -1,11 +1,11 @@ -use ra_text_edit::AtomTextEdit; +use hir::source_binder; use ra_syntax::{ - AstNode, SyntaxNode, SourceFile, TextUnit, TextRange, SyntaxToken, Parse, - ast, - algo::{find_token_at_offset, find_covering_element, find_node_at_offset}, + algo::{find_covering_element, find_node_at_offset, find_token_at_offset}, + ast, AstNode, Parse, SourceFile, SyntaxKind::*, + SyntaxNode, SyntaxToken, TextRange, TextUnit, }; -use hir::source_binder; +use ra_text_edit::AtomTextEdit; use crate::{db, FilePosition}; diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs index 6f2a60640..f78c4c877 100644 --- a/crates/ra_ide_api/src/completion/completion_item.rs +++ b/crates/ra_ide_api/src/completion/completion_item.rs @@ -2,7 +2,7 @@ use std::fmt; use hir::Documentation; use ra_syntax::TextRange; -use ra_text_edit::{TextEditBuilder, TextEdit}; +use ra_text_edit::{TextEdit, TextEditBuilder}; /// `CompletionItem` describes a single completion variant in the editor pop-up. /// It is basically a POD with various properties. To construct a @@ -285,8 +285,8 @@ impl Into> for Completions { #[cfg(test)] pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec { - use crate::mock_analysis::{single_file_with_position, analysis_and_position}; use crate::completion::completions; + use crate::mock_analysis::{analysis_and_position, single_file_with_position}; let (analysis, position) = if code.contains("//-") { analysis_and_position(code) } else { diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index 973936736..98060947a 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -1,16 +1,14 @@ //! This modules takes care of rendering various defenitions as completion items. +use hir::{Docs, HasSource, HirDisplay, PerNs, Resolution}; use join_to_string::join; -use test_utils::tested_by; -use hir::{Docs, PerNs, Resolution, HirDisplay, HasSource}; use ra_syntax::ast::NameOwner; +use test_utils::tested_by; use crate::completion::{ - Completions, CompletionKind, CompletionItemKind, CompletionContext, CompletionItem, + CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions, }; -use crate::display::{ - function_label, const_label, type_label, -}; +use crate::display::{const_label, function_label, type_label}; impl Completions { pub(crate) fn add_field( @@ -178,7 +176,7 @@ impl Completions { mod tests { use test_utils::covers; - use crate::completion::{CompletionKind, check_completion}; + use crate::completion::{check_completion, CompletionKind}; fn check_reference_completion(code: &str, expected_completions: &str) { check_completion(code, expected_completions, CompletionKind::Reference); -- cgit v1.2.3