Skip to content

Commit 58c63cf

Browse files
committed
Add support for using qualified paths with structs in expression and pattern
position.
1 parent e243be6 commit 58c63cf

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/expr.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ pub(crate) fn format_expr(
107107
}
108108
ast::ExprKind::Unary(op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape),
109109
ast::ExprKind::Struct(ref struct_expr) => {
110-
let ast::StructExpr { fields, path, rest } = &**struct_expr;
110+
let ast::StructExpr {
111+
fields, path, rest, ..
112+
} = &**struct_expr;
111113
rewrite_struct_lit(context, path, fields, rest, &expr.attrs, expr.span, shape)
112114
}
113115
ast::ExprKind::Tup(ref items) => {

src/patterns.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn is_short_pattern_inner(pat: &ast::Pat) -> bool {
4545
| ast::PatKind::Path(..)
4646
| ast::PatKind::Range(..) => false,
4747
ast::PatKind::Tuple(ref subpats) => subpats.len() <= 1,
48-
ast::PatKind::TupleStruct(ref path, ref subpats) => {
48+
ast::PatKind::TupleStruct(_, ref path, ref subpats) => {
4949
path.segments.len() <= 1 && subpats.len() <= 1
5050
}
5151
ast::PatKind::Box(ref p) | ast::PatKind::Ref(ref p, _) | ast::PatKind::Paren(ref p) => {
@@ -226,7 +226,7 @@ impl Rewrite for Pat {
226226
PatKind::Path(ref q_self, ref path) => {
227227
rewrite_path(context, PathContext::Expr, q_self.as_ref(), path, shape)
228228
}
229-
PatKind::TupleStruct(ref path, ref pat_vec) => {
229+
PatKind::TupleStruct(_, ref path, ref pat_vec) => {
230230
let path_str = rewrite_path(context, PathContext::Expr, None, path, shape)?;
231231
rewrite_tuple_pat(pat_vec, Some(path_str), self.span, context, shape)
232232
}
@@ -244,7 +244,7 @@ impl Rewrite for Pat {
244244
.collect();
245245
Some(format!("[{}]", rw.join(", ")))
246246
}
247-
PatKind::Struct(ref path, ref fields, ellipsis) => {
247+
PatKind::Struct(_, ref path, ref fields, ellipsis) => {
248248
rewrite_struct_pat(path, fields, ellipsis, self.span, context, shape)
249249
}
250250
PatKind::MacCall(ref mac) => {

0 commit comments

Comments
 (0)