cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / issue-13027.rs

diff --git a/src/test/run-pass/issue-13027.rs b/src/test/run-pass/issue-13027.rs
index 0efe64448c3d04f4ba27c7e35c6ef14703b8b63c..1f61da2f424f0c4337e8194b49f84a5c18cebab1 100644 (file)
--- a/src/test/run-pass/issue-13027.rs
+++ b/src/test/run-pass/issue-13027.rs
@@ -31,7 +31,7 @@ pub fn main() {
 fn lit_shadow_range() {
     assert_eq!(2i, match 1i {
         1 if false => 1i,
-        1..2 => 2,
+        1...2 => 2,
         _ => 3
     });
 
@@ -39,34 +39,34 @@ fn lit_shadow_range() {
     assert_eq!(2i, match x+1 {
         0 => 0i,
         1 if false => 1,
-        1..2 => 2,
+        1...2 => 2,
         _ => 3
     });
 
     assert_eq!(2i, match val() {
         1 if false => 1i,
-        1..2 => 2,
+        1...2 => 2,
         _ => 3
     });
 
     assert_eq!(2i, match CONST {
         0 => 0i,
         1 if false => 1,
-        1..2 => 2,
+        1...2 => 2,
         _ => 3
     });
 
     // value is out of the range of second arm, should match wildcard pattern
     assert_eq!(3i, match 3i {
         1 if false => 1i,
-        1..2 => 2,
+        1...2 => 2,
         _ => 3
     });
 }
 
 fn range_shadow_lit() {
     assert_eq!(2i, match 1i {
-        1..2 if false => 1i,
+        1...2 if false => 1i,
         1 => 2,
         _ => 3
     });
@@ -74,27 +74,27 @@ fn range_shadow_lit() {
     let x = 0i;
     assert_eq!(2i, match x+1 {
         0 => 0i,
-        1..2 if false => 1,
+        1...2 if false => 1,
         1 => 2,
         _ => 3
     });
 
     assert_eq!(2i, match val() {
-        1..2 if false => 1i,
+        1...2 if false => 1i,
         1 => 2,
         _ => 3
     });
 
     assert_eq!(2i, match CONST {
         0 => 0i,
-        1..2 if false => 1,
+        1...2 if false => 1,
         1 => 2,
         _ => 3
     });
 
     // ditto
     assert_eq!(3i, match 3i {
-        1..2 if false => 1i,
+        1...2 if false => 1i,
         1 => 2,
         _ => 3
     });
@@ -102,36 +102,36 @@ fn range_shadow_lit() {
 
 fn range_shadow_range() {
     assert_eq!(2i, match 1i {
-        0..2 if false => 1i,
-        1..3 => 2,
+        0...2 if false => 1i,
+        1...3 => 2,
         _ => 3,
     });
 
     let x = 0i;
     assert_eq!(2i, match x+1 {
         100 => 0,
-        0..2 if false => 1,
-        1..3 => 2,
+        0...2 if false => 1,
+        1...3 => 2,
         _ => 3,
     });
 
     assert_eq!(2i, match val() {
-        0..2 if false => 1,
-        1..3 => 2,
+        0...2 if false => 1,
+        1...3 => 2,
         _ => 3,
     });
 
     assert_eq!(2i, match CONST {
         100 => 0,
-        0..2 if false => 1,
-        1..3 => 2,
+        0...2 if false => 1,
+        1...3 => 2,
         _ => 3,
     });
 
     // ditto
     assert_eq!(3i, match 5i {
-        0..2 if false => 1i,
-        1..3 => 2,
+        0...2 if false => 1i,
+        1...3 => 2,
         _ => 3,
     });
 }
@@ -139,7 +139,7 @@ fn range_shadow_range() {
 fn multi_pats_shadow_lit() {
     assert_eq!(2i, match 1i {
         100 => 0i,
-        0 | 1..10 if false => 1,
+        0 | 1...10 if false => 1,
         1 => 2,
         _ => 3,
     });
@@ -148,8 +148,8 @@ fn multi_pats_shadow_lit() {
 fn multi_pats_shadow_range() {
     assert_eq!(2i, match 1i {
         100 => 0i,
-        0 | 1..10 if false => 1,
-        1..3 => 2,
+        0 | 1...10 if false => 1,
+        1...3 => 2,
         _ => 3,
     });
 }
@@ -158,7 +158,7 @@ fn lit_shadow_multi_pats() {
     assert_eq!(2i, match 1i {
         100 => 0i,
         1 if false => 1,
-        0 | 1..10 => 2,
+        0 | 1...10 => 2,
         _ => 3,
     });
 }
@@ -166,8 +166,8 @@ fn lit_shadow_multi_pats() {
 fn range_shadow_multi_pats() {
     assert_eq!(2i, match 1i {
         100 => 0i,
-        1..3 if false => 1,
-        0 | 1..10 => 2,
+        1...3 if false => 1,
+        0 | 1...10 => 2,
         _ => 3,
     });
 }
@@ -179,9 +179,9 @@ enum Foo {
     // This test basically mimics how trace_macros! macro is implemented,
     // which is a rare combination of vector patterns, multiple wild-card
     // patterns and guard functions.
-    let r = match [Bar(0, false)].as_slice() {
-        [Bar(_, pred)] if pred => 1i,
-        [Bar(_, pred)] if !pred => 2i,
+    let r = match [Foo::Bar(0, false)].as_slice() {
+        [Foo::Bar(_, pred)] if pred => 1i,
+        [Foo::Bar(_, pred)] if !pred => 2i,
         _ => 0i,
     };
     assert_eq!(2i, r);