Remove index type check (review comment)

diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index 986f1b9e4196f47520d60f1aed976d5bb12e7eea..39ec33eef1fec518542f3001a5335fd914459042 100644 (file)
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -244,23 +244,6 @@ impl Path {
     pub fn is_global(&self) -> bool {
         !self.segments.is_empty() && self.segments[0].name == keywords::CrateRoot.name()
     }
-
-    /// Wether this path is any of `::std::ops::{Range, RangeTo, RangeFrom}`.
-    pub fn is_range(&self) -> bool {
-        let mut base = ["{{root}}", "std", "ops"].iter().map(|p| p.to_string()).collect::<Vec<_>>();
-        let range_paths = ["Range", "RangeTo", "RangeFrom"];
-        let segments = self.segments.iter()
-            .map(|segment| format!("{}", segment.name))
-            .collect::<Vec<String>>();
-        for path in &range_paths {
-            base.push(path.to_string());
-            if base == segments {
-                return true;
-            }
-            base.pop();
-        }
-        false
-    }
 }
 
 impl fmt::Debug for Path {

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index a8a8b20012b7acab2db0ff70432d5c40f1135543..46e2c3af5e632c2220f2e4f8e9c960c8951fadc6 100644 (file)
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -832,17 +832,11 @@ fn suggest_borrow_on_unsized_slice(&self,
             let parent_node = self.tcx.hir.get_parent_node(node_id);
             if let Some(hir::map::NodeLocal(ref local)) = self.tcx.hir.find(parent_node) {
                 if let Some(ref expr) = local.init {
-                    if let hir::ExprIndex(_, ref index) = expr.node {
-                        if let hir::ExprStruct(hir::QPath::Resolved(None, ref path),
-                                               ..) = index.node {
-                            if let (Ok(snippet), true) = (
-                                self.tcx.sess.codemap().span_to_snippet(expr.span),
-                                path.is_range()
-                            ) {
-                                err.span_suggestion(expr.span,
-                                                    "consider a slice instead",
-                                                    format!("&{}", snippet));
-                            }
+                    if let hir::ExprIndex(_, _) = expr.node {
+                        if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(expr.span) {
+                            err.span_suggestion(expr.span,
+                                                "consider a slice instead",
+                                                format!("&{}", snippet));
                         }
                     }
                 }

diff --git a/src/test/ui/suggestions/str-array-assignment.rs b/src/test/ui/suggestions/str-array-assignment.rs
index 52b39d390d62b6bfdb64dd5e669795f9f855de25..adec495e72a9f0135d9b4e649bb4d3b26c505e5c 100644 (file)
--- a/src/test/ui/suggestions/str-array-assignment.rs
+++ b/src/test/ui/suggestions/str-array-assignment.rs
@@ -20,7 +20,7 @@ fn main() { //~ NOTE expected `()` because of default return type
   //~| NOTE expected type
   let v = s[..2];
   //~^ ERROR the trait bound `str: std::marker::Sized` is not satisfied
-  //~| NOTE consider a slice instead
+  //~| HELP consider a slice instead
   //~| NOTE `str` does not have a constant size known at compile-time
   //~| HELP the trait `std::marker::Sized` is not implemented for `str`
   //~| NOTE all local variables must have a statically known size