Skip to content

Commit aaee2c1

Browse files
committed
refactor: use rewrite_range for ast::TyPatKind::Range
Reuse the range rewrite logic that we abstracted into `src/range.rs`.
1 parent 74ac980 commit aaee2c1

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

src/types.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ use crate::macros::{MacroPosition, rewrite_macro};
1717
use crate::overflow;
1818
use crate::pairs::{PairParts, rewrite_pair};
1919
use crate::patterns::rewrite_range_pat;
20+
use crate::range::rewrite_range;
2021
use crate::rewrite::{Rewrite, RewriteContext, RewriteError, RewriteErrorExt, RewriteResult};
2122
use crate::shape::Shape;
2223
use crate::source_map::SpanUtils;
2324
use crate::spanned::Spanned;
2425
use crate::utils::{
2526
colon_spaces, extra_offset, first_line_width, format_extern, format_mutability,
26-
last_line_extendable, last_line_width, mk_sp, rewrite_ident,
27+
format_range_end, last_line_extendable, last_line_width, mk_sp, rewrite_ident,
2728
};
2829

2930
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -1067,9 +1068,13 @@ impl Rewrite for ast::TyPat {
10671068

10681069
fn rewrite_result(&self, context: &RewriteContext<'_>, shape: Shape) -> RewriteResult {
10691070
match self.kind {
1070-
ast::TyPatKind::Range(ref lhs, ref rhs, ref end_kind) => {
1071-
rewrite_range_pat(context, shape, lhs, rhs, end_kind, self.span)
1072-
}
1071+
ast::TyPatKind::Range(ref lhs, ref rhs, ref end_kind) => rewrite_range(
1072+
context,
1073+
shape,
1074+
lhs.as_deref().map(|x| x.value.as_ref()),
1075+
rhs.as_deref().map(|x| x.value.as_ref()),
1076+
format_range_end(end_kind.node),
1077+
),
10731078
ast::TyPatKind::Or(ref variants) => {
10741079
let mut first = true;
10751080
let mut s = String::new();

0 commit comments

Comments
 (0)