diff options
| author | bors <bors@rust-lang.org> | 2015-02-03 03:44:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-03 03:44:05 +0000 |
| commit | 7858cb432d3f2efc0374424cb2b51518f697c172 (patch) | |
| tree | bccd460a861e61f758d2d459cb9da02b1ad8792b /src/test/debuginfo | |
| parent | eaf4c5c784637f3df8bdebc6ec21dbd4bc69420a (diff) | |
| parent | 9ece22ee00033cdf0b6b418c451112c92c8ad922 (diff) | |
| download | rust-7858cb432d3f2efc0374424cb2b51518f697c172.tar.gz rust-7858cb432d3f2efc0374424cb2b51518f697c172.zip | |
Auto merge of #21872 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/destructured-for-loop-variable.rs | 6 | ||||
| -rw-r--r-- | src/test/debuginfo/lexical-scope-in-for-loop.rs | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/unreachable-locals.rs | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/src/test/debuginfo/destructured-for-loop-variable.rs index 08062ce8966..0d526d60190 100644 --- a/src/test/debuginfo/destructured-for-loop-variable.rs +++ b/src/test/debuginfo/destructured-for-loop-variable.rs @@ -170,14 +170,14 @@ fn main() { z: true }; - for &Struct { x, y, z } in [s].iter() { + for &Struct { x, y, z } in &[s] { zzz(); // #break } let tuple: (i8, u8, i16, u16, i32, u32, i64, u64, f32, f64) = (0x6f, 0x70, -113, 114, -115, 116, -117, 118, 119.5, 120.5); - for &(_i8, _u8, _i16, _u16, _i32, _u32, _i64, _u64, _f32, _f64) in [tuple].iter() { + for &(_i8, _u8, _i16, _u16, _i32, _u32, _i64, _u64, _f32, _f64) in &[tuple] { zzz(); // #break } @@ -215,7 +215,7 @@ fn main() { zzz(); // #break } - for simple_tuple_ident in vec![(34903493u32, 232323i64)].into_iter() { + for simple_tuple_ident in vec![(34903493u32, 232323i64)] { zzz(); // #break } } diff --git a/src/test/debuginfo/lexical-scope-in-for-loop.rs b/src/test/debuginfo/lexical-scope-in-for-loop.rs index 1fa54e47163..fe5983cbb6a 100644 --- a/src/test/debuginfo/lexical-scope-in-for-loop.rs +++ b/src/test/debuginfo/lexical-scope-in-for-loop.rs @@ -94,7 +94,7 @@ fn main() { let x = 1000000; // wan meeeljen doollaars! - for &x in range.iter() { + for &x in &range { zzz(); // #break sentinel(); diff --git a/src/test/debuginfo/unreachable-locals.rs b/src/test/debuginfo/unreachable-locals.rs index 70f8b1ccd96..8bcb54af8ba 100644 --- a/src/test/debuginfo/unreachable-locals.rs +++ b/src/test/debuginfo/unreachable-locals.rs @@ -26,7 +26,7 @@ fn after_return() { match (20i32, 'c') { (a, ref b) => {} } - for a in [111i32].iter() {} + for a in &[111i32] {} } fn after_panic() { @@ -36,7 +36,7 @@ fn after_panic() { match (20i32, 'c') { (a, ref b) => {} } - for a in [111i32].iter() {} + for a in &[111i32] {} } fn after_diverging_function() { @@ -46,7 +46,7 @@ fn after_diverging_function() { match (20i32, 'c') { (a, ref b) => {} } - for a in [111i32].iter() {} + for a in &[111i32] {} } fn after_break() { @@ -57,7 +57,7 @@ fn after_break() { match (20i32, 'c') { (a, ref b) => {} } - for a in [111i32].iter() {} + for a in &[111i32] {} } } @@ -69,7 +69,7 @@ fn after_continue() { match (20i32, 'c') { (a, ref b) => {} } - for a in [111i32].iter() {} + for a in &[111i32] {} } } |
