diff --git a/src/librustc_typeck/check/demand.rs b/src/librustc_typeck/check/demand.rs index e0577add61c2..6eaeee5c0e28 100644 --- a/src/librustc_typeck/check/demand.rs +++ b/src/librustc_typeck/check/demand.rs @@ -317,7 +317,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { _ if self.is_range_literal(expr) => true, _ => false, }; - let sugg_expr = if needs_parens { format!("({})", src) } else { src }; + let sugg_expr = if needs_parens { + format!("({})", src) + } else { + src + }; if let Some(sugg) = self.can_use_as_ref(expr) { return Some(sugg); @@ -379,67 +383,56 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { None } - // This function checks if the specified expression is a built-in range literal - // (See: librustc/hir/lowering.rs::LoweringContext::lower_expr() ) + /// This function checks if the specified expression is a built-in range literal. + /// (See: ``librustc::hir::lowering::LoweringContext::lower_expr()``). fn is_range_literal(&self, expr: &hir::Expr) -> bool { use hir::{Path, QPath, ExprKind, TyKind}; - // we support `::std::ops::Range` and `::std::core::Range` prefixes - // (via split on "|") - let ops_path = ["{{root}}", "std|core", "ops"]; - + // We support `::std::ops::Range` and `::core::ops::Range` prefixes let is_range_path = |path: &Path| { - let ident_names: Vec<_> = path.segments - .iter() - .map(|seg| seg.ident.as_str()) - .collect(); + let mut segs = path.segments.iter() + .map(|seg| seg.ident.as_str()); - if let Some((last, preceding)) = ident_names.split_last() { - last.starts_with("Range") && - preceding.len() == 3 && - preceding.iter() - .zip(ops_path.iter()) - .all(|(seg, match_seg)| { - match_seg.split("|") - .into_iter() - .any(|ref spl_seg| seg == spl_seg) - }) + if let (Some(root), Some(std_core), Some(ops), Some(range), None) = + (segs.next(), segs.next(), segs.next(), segs.next(), segs.next()) + { + // "{{root}}" is the equivalent of `::` prefix in Path + root == "{{root}}" && (std_core == "std" || std_core == "core") + && ops == "ops" && range.starts_with("Range") } else { false } }; - let is_range_struct_snippet = |span: &Span| { - // Tell if expression span snippet looks like an explicit - // Range struct or new() call. This is to allow rejecting - // Ranges constructed with non-literals. + let is_range_literal = |span: &Span| { + // Tell if expression span snippet doesn't look like an explicit + // Range struct or `new()` call. This is to allow inferring + // that this is a range literal. let source_map = self.tcx.sess.source_map(); let end_point = source_map.end_point(*span); if let Ok(end_string) = source_map.span_to_snippet(end_point) { - end_string.ends_with("}") || end_string.ends_with(")") + !(end_string.ends_with("}") || end_string.ends_with(")")) } else { false } - }; match expr.node { - // all built-in range literals but `..=` and `..` - // desugar to Structs, `..` desugars to its struct path + // All built-in range literals but `..=` and `..` desugar to Structs ExprKind::Struct(QPath::Resolved(None, ref path), _, _) | + // `..` desugars to its struct path ExprKind::Path(QPath::Resolved(None, ref path)) => { - return is_range_path(&path) && !is_range_struct_snippet(&expr.span); + return is_range_path(&path) && is_range_literal(&expr.span); } - // `..=` desugars into RangeInclusive::new(...) + // `..=` desugars into `::std::ops::RangeInclusive::new(...)` ExprKind::Call(ref func, _) => { if let ExprKind::Path(QPath::TypeRelative(ref ty, ref segment)) = func.node { if let TyKind::Path(QPath::Resolved(None, ref path)) = ty.node { - let calls_new = segment.ident.as_str() == "new"; + let call_to_new = segment.ident.as_str() == "new"; - return is_range_path(&path) && calls_new && - !is_range_struct_snippet(&expr.span); + return is_range_path(&path) && is_range_literal(&expr.span) && call_to_new; } } } diff --git a/src/test/ui/range/issue-54505-no-literals.fixed b/src/test/ui/range/issue-54505-no-literals.fixed index 5be024dff530..4d8f67182b9a 100644 --- a/src/test/ui/range/issue-54505-no-literals.fixed +++ b/src/test/ui/range/issue-54505-no-literals.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Regression test for changes introduced while fixing #54505 diff --git a/src/test/ui/range/issue-54505-no-literals.rs b/src/test/ui/range/issue-54505-no-literals.rs index 57d1938aca87..dc21dcbc2db4 100644 --- a/src/test/ui/range/issue-54505-no-literals.rs +++ b/src/test/ui/range/issue-54505-no-literals.rs @@ -1,13 +1,3 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Regression test for changes introduced while fixing #54505 diff --git a/src/test/ui/range/issue-54505-no-literals.stderr b/src/test/ui/range/issue-54505-no-literals.stderr index a8be4de5f0e7..b8811c98d21b 100644 --- a/src/test/ui/range/issue-54505-no-literals.stderr +++ b/src/test/ui/range/issue-54505-no-literals.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:26:16 + --> $DIR/issue-54505-no-literals.rs:16:16 | LL | take_range(std::ops::Range { start: 0, end: 1 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | take_range(std::ops::Range { start: 0, end: 1 }); found type `std::ops::Range<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:31:16 + --> $DIR/issue-54505-no-literals.rs:21:16 | LL | take_range(::std::ops::Range { start: 0, end: 1 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | take_range(::std::ops::Range { start: 0, end: 1 }); found type `std::ops::Range<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:36:16 + --> $DIR/issue-54505-no-literals.rs:26:16 | LL | take_range(std::ops::RangeFrom { start: 1 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | take_range(std::ops::RangeFrom { start: 1 }); found type `std::ops::RangeFrom<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:41:16 + --> $DIR/issue-54505-no-literals.rs:31:16 | LL | take_range(::std::ops::RangeFrom { start: 1 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | take_range(::std::ops::RangeFrom { start: 1 }); found type `std::ops::RangeFrom<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:46:16 + --> $DIR/issue-54505-no-literals.rs:36:16 | LL | take_range(std::ops::RangeFull {}); | ^^^^^^^^^^^^^^^^^^^^^^ @@ -59,7 +59,7 @@ LL | take_range(std::ops::RangeFull {}); found type `std::ops::RangeFull` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:51:16 + --> $DIR/issue-54505-no-literals.rs:41:16 | LL | take_range(::std::ops::RangeFull {}); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | take_range(::std::ops::RangeFull {}); found type `std::ops::RangeFull` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:56:16 + --> $DIR/issue-54505-no-literals.rs:46:16 | LL | take_range(std::ops::RangeInclusive::new(0, 1)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -83,7 +83,7 @@ LL | take_range(std::ops::RangeInclusive::new(0, 1)); found type `std::ops::RangeInclusive<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:61:16 + --> $DIR/issue-54505-no-literals.rs:51:16 | LL | take_range(::std::ops::RangeInclusive::new(0, 1)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | take_range(::std::ops::RangeInclusive::new(0, 1)); found type `std::ops::RangeInclusive<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:66:16 + --> $DIR/issue-54505-no-literals.rs:56:16 | LL | take_range(std::ops::RangeTo { end: 5 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -107,7 +107,7 @@ LL | take_range(std::ops::RangeTo { end: 5 }); found type `std::ops::RangeTo<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:71:16 + --> $DIR/issue-54505-no-literals.rs:61:16 | LL | take_range(::std::ops::RangeTo { end: 5 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | take_range(::std::ops::RangeTo { end: 5 }); found type `std::ops::RangeTo<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:76:16 + --> $DIR/issue-54505-no-literals.rs:66:16 | LL | take_range(std::ops::RangeToInclusive { end: 5 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -131,7 +131,7 @@ LL | take_range(std::ops::RangeToInclusive { end: 5 }); found type `std::ops::RangeToInclusive<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-literals.rs:81:16 + --> $DIR/issue-54505-no-literals.rs:71:16 | LL | take_range(::std::ops::RangeToInclusive { end: 5 }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/range/issue-54505-no-std.rs b/src/test/ui/range/issue-54505-no-std.rs index 0dadaecd7d8a..c2b17b53ba16 100644 --- a/src/test/ui/range/issue-54505-no-std.rs +++ b/src/test/ui/range/issue-54505-no-std.rs @@ -1,13 +1,3 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `#[panic_handler]` function required, but not found // error-pattern: language item required, but not found: `eh_personality` diff --git a/src/test/ui/range/issue-54505-no-std.stderr b/src/test/ui/range/issue-54505-no-std.stderr index 035bc6406586..2810a3f076d4 100644 --- a/src/test/ui/range/issue-54505-no-std.stderr +++ b/src/test/ui/range/issue-54505-no-std.stderr @@ -3,7 +3,7 @@ error: `#[panic_handler]` function required, but not found error: language item required, but not found: `eh_personality` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:31:16 + --> $DIR/issue-54505-no-std.rs:21:16 | LL | take_range(0..1); | ^^^^ @@ -15,7 +15,7 @@ LL | take_range(0..1); found type `core::ops::Range<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:36:16 + --> $DIR/issue-54505-no-std.rs:26:16 | LL | take_range(1..); | ^^^ @@ -27,7 +27,7 @@ LL | take_range(1..); found type `core::ops::RangeFrom<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:41:16 + --> $DIR/issue-54505-no-std.rs:31:16 | LL | take_range(..); | ^^ @@ -39,7 +39,7 @@ LL | take_range(..); found type `core::ops::RangeFull` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:46:16 + --> $DIR/issue-54505-no-std.rs:36:16 | LL | take_range(0..=1); | ^^^^^ @@ -51,7 +51,7 @@ LL | take_range(0..=1); found type `core::ops::RangeInclusive<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:51:16 + --> $DIR/issue-54505-no-std.rs:41:16 | LL | take_range(..5); | ^^^ @@ -63,7 +63,7 @@ LL | take_range(..5); found type `core::ops::RangeTo<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505-no-std.rs:56:16 + --> $DIR/issue-54505-no-std.rs:46:16 | LL | take_range(..=42); | ^^^^^ diff --git a/src/test/ui/range/issue-54505.fixed b/src/test/ui/range/issue-54505.fixed index ef8ded0f7a34..f8298c0b5cef 100644 --- a/src/test/ui/range/issue-54505.fixed +++ b/src/test/ui/range/issue-54505.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Regression test for #54505 - range borrowing suggestion had diff --git a/src/test/ui/range/issue-54505.rs b/src/test/ui/range/issue-54505.rs index b81c879a37ea..03673252dd3b 100644 --- a/src/test/ui/range/issue-54505.rs +++ b/src/test/ui/range/issue-54505.rs @@ -1,13 +1,3 @@ -// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Regression test for #54505 - range borrowing suggestion had diff --git a/src/test/ui/range/issue-54505.stderr b/src/test/ui/range/issue-54505.stderr index 5a59594ff500..d6e1fb0cef23 100644 --- a/src/test/ui/range/issue-54505.stderr +++ b/src/test/ui/range/issue-54505.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-54505.rs:24:16 + --> $DIR/issue-54505.rs:14:16 | LL | take_range(0..1); | ^^^^ @@ -11,7 +11,7 @@ LL | take_range(0..1); found type `std::ops::Range<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505.rs:29:16 + --> $DIR/issue-54505.rs:19:16 | LL | take_range(1..); | ^^^ @@ -23,7 +23,7 @@ LL | take_range(1..); found type `std::ops::RangeFrom<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505.rs:34:16 + --> $DIR/issue-54505.rs:24:16 | LL | take_range(..); | ^^ @@ -35,7 +35,7 @@ LL | take_range(..); found type `std::ops::RangeFull` error[E0308]: mismatched types - --> $DIR/issue-54505.rs:39:16 + --> $DIR/issue-54505.rs:29:16 | LL | take_range(0..=1); | ^^^^^ @@ -47,7 +47,7 @@ LL | take_range(0..=1); found type `std::ops::RangeInclusive<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505.rs:44:16 + --> $DIR/issue-54505.rs:34:16 | LL | take_range(..5); | ^^^ @@ -59,7 +59,7 @@ LL | take_range(..5); found type `std::ops::RangeTo<{integer}>` error[E0308]: mismatched types - --> $DIR/issue-54505.rs:49:16 + --> $DIR/issue-54505.rs:39:16 | LL | take_range(..=42); | ^^^^^