Skip to content

Commit 5cc4e94

Browse files
committed
fix rebase fallout
1 parent 998b33e commit 5cc4e94

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/librustc_parse/parser/item.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ use crate::maybe_whole;
66

77
use rustc_ast::ast::{self, AttrStyle, AttrVec, Attribute, Ident, DUMMY_NODE_ID};
88
use rustc_ast::ast::{AssocItem, AssocItemKind, ForeignItemKind, Item, ItemKind, Mod};
9-
use rustc_ast::ast::{
10-
Async, Const, Defaultness, IsAuto, PathSegment, Unsafe, UseTree, UseTreeKind,
11-
};
12-
use rustc_ast::ast::{
13-
BindingMode, Block, FnDecl, FnSig, MacArgs, MacCall, MacDelimiter, Param, SelfKind,
14-
};
9+
use rustc_ast::ast::{Async, Const, Defaultness, IsAuto, Mutability, Unsafe, UseTree, UseTreeKind};
10+
use rustc_ast::ast::{BindingMode, Block, FnDecl, FnSig, Param, SelfKind};
1511
use rustc_ast::ast::{EnumDef, Generics, StructField, TraitRef, Ty, TyKind, Variant, VariantData};
16-
use rustc_ast::ast::{FnHeader, ForeignItem, Mutability, SelfKind, Visibility, VisibilityKind};
12+
use rustc_ast::ast::{FnHeader, ForeignItem, PathSegment, Visibility, VisibilityKind};
13+
use rustc_ast::ast::{MacArgs, MacCall, MacDelimiter};
1714
use rustc_ast::ptr::P;
1815
use rustc_ast::token::{self, TokenKind};
1916
use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};

0 commit comments

Comments
 (0)