diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
| commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
| tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_ide_api/src/display | |
| parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
| parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) | |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Diffstat (limited to 'crates/ra_ide_api/src/display')
| -rw-r--r-- | crates/ra_ide_api/src/display/function_signature.rs | 7 | ||||
| -rw-r--r-- | crates/ra_ide_api/src/display/navigation_target.rs | 11 | ||||
| -rw-r--r-- | crates/ra_ide_api/src/display/short_label.rs | 4 | ||||
| -rw-r--r-- | crates/ra_ide_api/src/display/structure.rs | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/crates/ra_ide_api/src/display/function_signature.rs b/crates/ra_ide_api/src/display/function_signature.rs index b0b0c7122..e7ad5a0d1 100644 --- a/crates/ra_ide_api/src/display/function_signature.rs +++ b/crates/ra_ide_api/src/display/function_signature.rs | |||
| @@ -1,11 +1,14 @@ | |||
| 1 | use std::fmt::{self, Display}; | 1 | use std::fmt::{self, Display}; |
| 2 | 2 | ||
| 3 | use hir::{Docs, Documentation, HasSource}; | ||
| 3 | use join_to_string::join; | 4 | use join_to_string::join; |
| 4 | use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; | 5 | use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; |
| 5 | use std::convert::From; | 6 | use std::convert::From; |
| 6 | use hir::{Docs, Documentation, HasSource}; | ||
| 7 | 7 | ||
| 8 | use crate::{db, display::{where_predicates, generic_parameters}}; | 8 | use crate::{ |
| 9 | db, | ||
| 10 | display::{generic_parameters, where_predicates}, | ||
| 11 | }; | ||
| 9 | 12 | ||
| 10 | /// Contains information about a function signature | 13 | /// Contains information about a function signature |
| 11 | #[derive(Debug)] | 14 | #[derive(Debug)] |
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs index 823cdaaf3..1edb64e3d 100644 --- a/crates/ra_ide_api/src/display/navigation_target.rs +++ b/crates/ra_ide_api/src/display/navigation_target.rs | |||
| @@ -1,14 +1,15 @@ | |||
| 1 | use hir::{FieldSource, HasSource, ImplItem, ModuleSource}; | ||
| 1 | use ra_db::{FileId, SourceDatabase}; | 2 | use ra_db::{FileId, SourceDatabase}; |
| 2 | use ra_syntax::{ | 3 | use ra_syntax::{ |
| 3 | SyntaxNode, AstNode, SmolStr, TextRange, AstPtr, TreeArc, | ||
| 4 | SyntaxKind::{self, NAME}, | ||
| 5 | ast::{self, DocCommentsOwner}, | ||
| 6 | algo::visit::{visitor, Visitor}, | 4 | algo::visit::{visitor, Visitor}, |
| 5 | ast::{self, DocCommentsOwner}, | ||
| 6 | AstNode, AstPtr, SmolStr, | ||
| 7 | SyntaxKind::{self, NAME}, | ||
| 8 | SyntaxNode, TextRange, TreeArc, | ||
| 7 | }; | 9 | }; |
| 8 | use hir::{ModuleSource, FieldSource, ImplItem, HasSource}; | ||
| 9 | 10 | ||
| 10 | use crate::{FileSymbol, db::RootDatabase}; | ||
| 11 | use super::short_label::ShortLabel; | 11 | use super::short_label::ShortLabel; |
| 12 | use crate::{db::RootDatabase, FileSymbol}; | ||
| 12 | 13 | ||
| 13 | /// `NavigationTarget` represents and element in the editor's UI which you can | 14 | /// `NavigationTarget` represents and element in the editor's UI which you can |
| 14 | /// click on to navigate to a particular piece of code. | 15 | /// click on to navigate to a particular piece of code. |
diff --git a/crates/ra_ide_api/src/display/short_label.rs b/crates/ra_ide_api/src/display/short_label.rs index dc8245c34..f926f631f 100644 --- a/crates/ra_ide_api/src/display/short_label.rs +++ b/crates/ra_ide_api/src/display/short_label.rs | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | use ra_syntax::{ | 1 | use ra_syntax::ast::{self, AstNode, NameOwner, TypeAscriptionOwner, VisibilityOwner}; |
| 2 | ast::{self, NameOwner, VisibilityOwner, TypeAscriptionOwner, AstNode}, | ||
| 3 | }; | ||
| 4 | 2 | ||
| 5 | pub(crate) trait ShortLabel { | 3 | pub(crate) trait ShortLabel { |
| 6 | fn short_label(&self) -> Option<String>; | 4 | fn short_label(&self) -> Option<String>; |
diff --git a/crates/ra_ide_api/src/display/structure.rs b/crates/ra_ide_api/src/display/structure.rs index e5057e833..e5b257b9b 100644 --- a/crates/ra_ide_api/src/display/structure.rs +++ b/crates/ra_ide_api/src/display/structure.rs | |||
| @@ -2,7 +2,7 @@ use crate::TextRange; | |||
| 2 | 2 | ||
| 3 | use ra_syntax::{ | 3 | use ra_syntax::{ |
| 4 | algo::visit::{visitor, Visitor}, | 4 | algo::visit::{visitor, Visitor}, |
| 5 | ast::{self, AttrsOwner, NameOwner, TypeParamsOwner, TypeAscriptionOwner}, | 5 | ast::{self, AttrsOwner, NameOwner, TypeAscriptionOwner, TypeParamsOwner}, |
| 6 | AstNode, SourceFile, SyntaxKind, SyntaxNode, WalkEvent, | 6 | AstNode, SourceFile, SyntaxKind, SyntaxNode, WalkEvent, |
| 7 | }; | 7 | }; |
| 8 | 8 | ||