Skip to content

Commit 309bf2f

Browse files
committed
lowering: extract lower_expr_range_closed
1 parent c789e7a commit 309bf2f

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/librustc/hir/lowering/expr.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -362,18 +362,8 @@ impl LoweringContext<'_> {
362362
ExprKind::Index(ref el, ref er) => {
363363
hir::ExprKind::Index(P(self.lower_expr(el)), P(self.lower_expr(er)))
364364
}
365-
// Desugar `<start>..=<end>` into `std::ops::RangeInclusive::new(<start>, <end>)`.
366365
ExprKind::Range(Some(ref e1), Some(ref e2), RangeLimits::Closed) => {
367-
let id = self.next_id();
368-
let e1 = self.lower_expr(e1);
369-
let e2 = self.lower_expr(e2);
370-
self.expr_call_std_assoc_fn(
371-
id,
372-
e.span,
373-
&[sym::ops, sym::RangeInclusive],
374-
"new",
375-
hir_vec![e1, e2],
376-
)
366+
self.lower_expr_range_closed(e.span, e1, e2)
377367
}
378368
ExprKind::Range(ref e1, ref e2, lims) => {
379369
self.lower_expr_range(e.span, e1.as_deref(), e2.as_deref(), lims)
@@ -459,6 +449,20 @@ impl LoweringContext<'_> {
459449
}
460450
}
461451

452+
/// Desugar `<start>..=<end>` into `std::ops::RangeInclusive::new(<start>, <end>)`.
453+
fn lower_expr_range_closed(&mut self, span: Span, e1: &Expr, e2: &Expr) -> hir::ExprKind {
454+
let id = self.next_id();
455+
let e1 = self.lower_expr(e1);
456+
let e2 = self.lower_expr(e2);
457+
self.expr_call_std_assoc_fn(
458+
id,
459+
span,
460+
&[sym::ops, sym::RangeInclusive],
461+
"new",
462+
hir_vec![e1, e2],
463+
)
464+
}
465+
462466
fn lower_expr_range(
463467
&mut self,
464468
span: Span,

0 commit comments

Comments
 (0)