Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/tools/rustfmt/src/visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,11 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
}

// TODO(calebcartwright): consider enabling box_patterns feature gate
match (&ai.kind, visitor_kind) {
(ast::AssocItemKind::Const(c), AssocTraitItem) => {
match (&ai.kind, assoc_ctxt) {
(ast::AssocItemKind::Const(c), visit::AssocCtxt::Trait) => {
self.visit_static(&StaticParts::from_trait_item(ai, c.ident))
}
(ast::AssocItemKind::Const(c), AssocImplItem) => {
(ast::AssocItemKind::Const(c), visit::AssocCtxt::Impl { .. }) => {
self.visit_static(&StaticParts::from_impl_item(ai, c.ident))
}
(ast::AssocItemKind::Fn(ref fn_kind), _) => {
Expand Down Expand Up @@ -714,7 +714,11 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
(ast::AssocItemKind::MacCall(ref mac), _) => {
self.visit_mac(mac, MacroPosition::Item);
}
_ => unreachable!(),
(ast::AssocItemKind::Delegation(_) | ast::AssocItemKind::DelegationMac(_), _) => {
// TODO(ytmimi) #![feature(fn_delegation)]
// add formatting for `AssocItemKind::Delegation` and `AssocItemKind::DelegationMac`
self.push_rewrite(ai.span, None);
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions src/tools/rustfmt/tests/target/issue_6513.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#![feature(fn_delegation)]

struct Ty;
impl Ty {
reuse std::convert::identity;
}

trait Trait {
reuse std::convert::identity;
}
Loading