From: mcarton <cartonmartin+git@gmail.com>
Date: Sat, 7 May 2016 22:56:23 +0000 (+0200)
Subject: Fix tests
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=aa10c93e8f337e43c2cbab63e98f31d95589defe;p=rust.git

Fix tests
---

diff --git a/src/len_zero.rs b/src/len_zero.rs
index 7a7a17bc79d..7e9d17d643b 100644
--- a/src/len_zero.rs
+++ b/src/len_zero.rs
@@ -113,14 +113,9 @@ fn is_named_self(item: &ImplItem, name: &str) -> bool {
             if is_named_self(i, "len") {
                 let ty = cx.tcx.node_id_to_type(item.id);
 
-                let s = i.span;
                 span_lint(cx,
                           LEN_WITHOUT_IS_EMPTY,
-                          Span {
-                              lo: s.lo,
-                              hi: s.lo,
-                              expn_id: s.expn_id,
-                          },
+                          i.span,
                           &format!("item `{}` has a `.len(_: &Self)` method, but no `.is_empty(_: &Self)` method. \
                                     Consider adding one",
                                    ty));
diff --git a/src/regex.rs b/src/regex.rs
index 72a33757027..e1b4237b9b2 100644
--- a/src/regex.rs
+++ b/src/regex.rs
@@ -143,14 +143,17 @@ fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
 
 #[allow(cast_possible_truncation)]
 fn str_span(base: Span, s: &str, c: usize) -> Span {
-    let lo = match s.char_indices().nth(c) {
-        Some((b, _)) => base.lo + BytePos(b as u32),
-        _ => base.hi,
-    };
-    Span {
-        lo: lo,
-        hi: lo,
-        ..base
+    let mut si = s.char_indices().skip(c);
+
+    match (si.next(), si.next())  {
+        (Some((l, _)), Some((h, _))) => {
+            Span {
+                lo: base.lo + BytePos(l as u32),
+                hi: base.lo + BytePos(h as u32),
+                ..base
+            }
+        }
+        _ => base,
     }
 }
 
diff --git a/tests/compile-fail/for_loop.rs b/tests/compile-fail/for_loop.rs
index 064f66537eb..2f164d1e569 100644
--- a/tests/compile-fail/for_loop.rs
+++ b/tests/compile-fail/for_loop.rs
@@ -340,7 +340,7 @@ fn main() {
     for (_, v) in &m {
         //~^ you seem to want to iterate on a map's values
         //~| HELP use the corresponding method
-        //~| SUGGESTION for v in &m.values()
+        //~| SUGGESTION for v in m.values()
         let _v = v;
     }
 
diff --git a/tests/compile-fail/matches.rs b/tests/compile-fail/matches.rs
index f5f830fed51..3444e49ec51 100644
--- a/tests/compile-fail/matches.rs
+++ b/tests/compile-fail/matches.rs
@@ -140,7 +140,7 @@ fn ref_pats() {
         match v {
             //~^ERROR add `&` to all patterns
             //~|HELP instead of
-            //~|SUGGESTION `match *v { .. }`
+            //~|SUGGESTION match *v { .. }
             &Some(v) => println!("{:?}", v),
             &None => println!("none"),
         }
@@ -153,7 +153,7 @@ fn ref_pats() {
     match tup {
         //~^ERROR add `&` to all patterns
         //~|HELP instead of
-        //~|SUGGESTION `match *tup { .. }`
+        //~|SUGGESTION match *tup { .. }
         &(v, 1) => println!("{}", v),
         _ => println!("none"),
     }
@@ -162,7 +162,7 @@ fn ref_pats() {
     match &w {
         //~^ERROR add `&` to both
         //~|HELP try
-        //~|SUGGESTION `match w { .. }`
+        //~|SUGGESTION match w { .. }
         &Some(v) => println!("{:?}", v),
         &None => println!("none"),
     }
@@ -176,7 +176,7 @@ fn ref_pats() {
     if let &None = a {
         //~^ERROR add `&` to all patterns
         //~|HELP instead of
-        //~|SUGGESTION `if let ... = *a { .. }`
+        //~|SUGGESTION if let .. = *a { .. }
         println!("none");
     }
 
@@ -184,7 +184,7 @@ fn ref_pats() {
     if let &None = &b {
         //~^ERROR add `&` to both
         //~|HELP try
-        //~|SUGGESTION `if let ... = b { .. }`
+        //~|SUGGESTION if let .. = b { .. }
         println!("none");
     }
 }
diff --git a/tests/compile-fail/regex.rs b/tests/compile-fail/regex.rs
index 606c3d513b2..9cd2bc8098e 100644
--- a/tests/compile-fail/regex.rs
+++ b/tests/compile-fail/regex.rs
@@ -16,6 +16,8 @@ fn syntax_error() {
     //~^ERROR: regex syntax error: empty alternate
     let wrong_char_ranice = Regex::new("[z-a]");
     //~^ERROR: regex syntax error: invalid character class range
+    let some_unicode = Regex::new("[é-è]");
+    //~^ERROR: regex syntax error: invalid character class range
 
     let some_regex = Regex::new(OPENING_PAREN);
     //~^ERROR: regex syntax error on position 0: unclosed