@@ -5423,7 +5423,7 @@ pub fn is_range_literal(sess: &Session, expr: &hir::Expr) -> bool {
5423
5423
5424
5424
// Check whether a span corresponding to a range expression is a
5425
5425
// range literal, rather than an explicit struct or `new()` call.
5426
- fn is_range_literal ( sess : & Session , span : & Span ) -> bool {
5426
+ fn is_lit ( sess : & Session , span : & Span ) -> bool {
5427
5427
let source_map = sess. source_map ( ) ;
5428
5428
let end_point = source_map. end_point ( * span) ;
5429
5429
@@ -5438,21 +5438,21 @@ pub fn is_range_literal(sess: &Session, expr: &hir::Expr) -> bool {
5438
5438
// All built-in range literals but `..=` and `..` desugar to `Struct`s.
5439
5439
ExprKind :: Struct ( ref qpath, _, _) => {
5440
5440
if let QPath :: Resolved ( None , ref path) = * * qpath {
5441
- return is_range_path ( & path) && is_range_literal ( sess, & expr. span ) ;
5441
+ return is_range_path ( & path) && is_lit ( sess, & expr. span ) ;
5442
5442
}
5443
5443
}
5444
5444
5445
5445
// `..` desugars to its struct path.
5446
5446
ExprKind :: Path ( QPath :: Resolved ( None , ref path) ) => {
5447
- return is_range_path ( & path) && is_range_literal ( sess, & expr. span ) ;
5447
+ return is_range_path ( & path) && is_lit ( sess, & expr. span ) ;
5448
5448
}
5449
5449
5450
5450
// `..=` desugars into `::std::ops::RangeInclusive::new(...)`.
5451
5451
ExprKind :: Call ( ref func, _) => {
5452
5452
if let ExprKind :: Path ( QPath :: TypeRelative ( ref ty, ref segment) ) = func. node {
5453
5453
if let TyKind :: Path ( QPath :: Resolved ( None , ref path) ) = ty. node {
5454
5454
let new_call = segment. ident . as_str ( ) == "new" ;
5455
- return is_range_path ( & path) && is_range_literal ( sess, & expr. span ) && new_call;
5455
+ return is_range_path ( & path) && is_lit ( sess, & expr. span ) && new_call;
5456
5456
}
5457
5457
}
5458
5458
}
0 commit comments