Skip to content

Commit 2de579d

Browse files
committed
chore: remove rewrite_range_pat and unused imports and impls
Now that we've centralized the logic into `rewrite_range` we no longer need a dedicated `rewrite_range_pat` function. Getting rid of that also lets us remove some other unnecessary code which is nice.
1 parent aaee2c1 commit 2de579d

3 files changed

Lines changed: 1 addition & 72 deletions

File tree

src/patterns.rs

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_ast::ast::{self, BindingMode, ByRef, Pat, PatField, PatKind, RangeEnd, RangeSyntax};
1+
use rustc_ast::ast::{self, BindingMode, ByRef, Pat, PatField, PatKind};
22
use rustc_span::{BytePos, Span};
33

44
use crate::comment::{FindUncommented, combine_strs_with_missing_comments};
@@ -11,7 +11,6 @@ use crate::lists::{
1111
};
1212
use crate::macros::{MacroPosition, rewrite_macro};
1313
use crate::overflow;
14-
use crate::pairs::{PairParts, rewrite_pair};
1514
use crate::range::rewrite_range;
1615
use crate::rewrite::{Rewrite, RewriteContext, RewriteError, RewriteErrorExt, RewriteResult};
1716
use crate::shape::Shape;
@@ -79,24 +78,6 @@ fn is_short_pattern_inner(context: &RewriteContext<'_>, pat: &ast::Pat) -> bool
7978
}
8079
}
8180

82-
pub(crate) struct RangeOperand<'a, T> {
83-
pub operand: &'a Option<Box<T>>,
84-
pub span: Span,
85-
}
86-
87-
impl<'a, T: Rewrite> Rewrite for RangeOperand<'a, T> {
88-
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
89-
self.rewrite_result(context, shape).ok()
90-
}
91-
92-
fn rewrite_result(&self, context: &RewriteContext<'_>, shape: Shape) -> RewriteResult {
93-
match &self.operand {
94-
None => Ok("".to_owned()),
95-
Some(ref exp) => exp.rewrite_result(context, shape),
96-
}
97-
}
98-
}
99-
10081
impl Rewrite for Pat {
10182
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
10283
self.rewrite_result(context, shape).ok()
@@ -362,50 +343,6 @@ impl Rewrite for Pat {
362343
}
363344
}
364345

365-
pub(crate) fn rewrite_range_pat<T: Rewrite>(
366-
context: &RewriteContext<'_>,
367-
shape: Shape,
368-
lhs: &Option<Box<T>>,
369-
rhs: &Option<Box<T>>,
370-
end_kind: &rustc_span::source_map::Spanned<RangeEnd>,
371-
span: Span,
372-
) -> RewriteResult {
373-
let infix = match end_kind.node {
374-
RangeEnd::Included(RangeSyntax::DotDotDot) => "...",
375-
RangeEnd::Included(RangeSyntax::DotDotEq) => "..=",
376-
RangeEnd::Excluded => "..",
377-
};
378-
let infix = if context.config.spaces_around_ranges() {
379-
let lhs_spacing = match lhs {
380-
None => "",
381-
Some(_) => " ",
382-
};
383-
let rhs_spacing = match rhs {
384-
None => "",
385-
Some(_) => " ",
386-
};
387-
format!("{lhs_spacing}{infix}{rhs_spacing}")
388-
} else {
389-
infix.to_owned()
390-
};
391-
let lspan = span.with_hi(end_kind.span.lo());
392-
let rspan = span.with_lo(end_kind.span.hi());
393-
rewrite_pair(
394-
&RangeOperand {
395-
operand: lhs,
396-
span: lspan,
397-
},
398-
&RangeOperand {
399-
operand: rhs,
400-
span: rspan,
401-
},
402-
PairParts::infix(&infix),
403-
context,
404-
shape,
405-
SeparatorPlace::Front,
406-
)
407-
}
408-
409346
fn rewrite_struct_pat(
410347
qself: &Option<Box<ast::QSelf>>,
411348
path: &ast::Path,

src/spanned.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use rustc_ast::ast;
44
use rustc_span::{Span, source_map};
55

66
use crate::macros::MacroArg;
7-
use crate::patterns::RangeOperand;
87
use crate::utils::{mk_sp, outer_attributes};
98

109
/// Spanned returns a span including attributes, if available.
@@ -205,9 +204,3 @@ impl Spanned for ast::PreciseCapturingArg {
205204
}
206205
}
207206
}
208-
209-
impl<'a, T> Spanned for RangeOperand<'a, T> {
210-
fn span(&self) -> Span {
211-
self.span
212-
}
213-
}

src/types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use crate::lists::{
1616
use crate::macros::{MacroPosition, rewrite_macro};
1717
use crate::overflow;
1818
use crate::pairs::{PairParts, rewrite_pair};
19-
use crate::patterns::rewrite_range_pat;
2019
use crate::range::rewrite_range;
2120
use crate::rewrite::{Rewrite, RewriteContext, RewriteError, RewriteErrorExt, RewriteResult};
2221
use crate::shape::Shape;

0 commit comments

Comments
 (0)