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
This commit is contained in:
Aleksey Kladov
2019-07-04 23:05:17 +03:00
parent 2b2cd829b0
commit 1834bae5b8
166 changed files with 798 additions and 814 deletions

View File

@@ -1,10 +1,10 @@
//! Various extension methods to ast Expr Nodes, which are hard to code-generate.
use crate::{
SyntaxToken, SyntaxElement, SmolStr,
ast::{self, AstNode, AstChildren, children, child_opt},
ast::{self, child_opt, children, AstChildren, AstNode},
SmolStr, SyntaxElement,
SyntaxKind::*,
T
SyntaxToken, T,
};
#[derive(Debug, Clone, PartialEq, Eq)]

View File

@@ -4,10 +4,10 @@
use itertools::Itertools;
use crate::{
SmolStr, SyntaxToken,
ast::{self, AstNode, children, child_opt},
ast::{self, child_opt, children, AstNode},
SmolStr, SyntaxElement,
SyntaxKind::*,
SyntaxElement, T,
SyntaxToken, T,
};
use ra_parser::SyntaxKind;

View File

@@ -1,9 +1,9 @@
//! There are many AstNodes, but only a few tokens, so we hand-write them here.
use crate::{
SyntaxToken,
SyntaxKind::{COMMENT, WHITESPACE},
ast::AstToken,
SyntaxKind::{COMMENT, WHITESPACE},
SyntaxToken,
};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -61,7 +61,7 @@ pub enum CommentPlacement {
}
const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = {
use {CommentShape::*, CommentPlacement::*};
use {CommentPlacement::*, CommentShape::*};
&[
("///", CommentKind { shape: Line, doc: Some(Outer) }),
("//!", CommentKind { shape: Line, doc: Some(Inner) }),

View File

@@ -5,8 +5,8 @@
use itertools::Itertools;
use crate::{
syntax_node::{SyntaxNodeChildren, SyntaxElementChildren},
ast::{self, child_opt, children, AstNode, AstToken, AstChildren},
ast::{self, child_opt, children, AstChildren, AstNode, AstToken},
syntax_node::{SyntaxElementChildren, SyntaxNodeChildren},
};
pub trait TypeAscriptionOwner: AstNode {