diff options
| author | Derek Guenther <dguenther9@gmail.com> | 2014-02-05 16:33:10 -0600 |
|---|---|---|
| committer | Derek Guenther <dguenther9@gmail.com> | 2014-02-07 12:49:24 -0600 |
| commit | 730bdb6403dd47b98c1be6c4b3423edb28ca9477 (patch) | |
| tree | 9d6923ca67637c0ca19464e9df0d31ca1332d3db /src/test/debug-info | |
| parent | c3ccaacc6c90fc678cbba9c3c0427f0a7dece75c (diff) | |
| download | rust-730bdb6403dd47b98c1be6c4b3423edb28ca9477.tar.gz rust-730bdb6403dd47b98c1be6c4b3423edb28ca9477.zip | |
Added tests to make tidy
Diffstat (limited to 'src/test/debug-info')
| -rw-r--r-- | src/test/debug-info/borrowed-enum.rs | 12 | ||||
| -rw-r--r-- | src/test/debug-info/destructured-fn-argument.rs | 3 | ||||
| -rw-r--r-- | src/test/debug-info/generic-struct-style-enum.rs | 1 | ||||
| -rw-r--r-- | src/test/debug-info/generic-tuple-style-enum.rs | 1 | ||||
| -rw-r--r-- | src/test/debug-info/include_string.rs | 2 | ||||
| -rw-r--r-- | src/test/debug-info/issue11600.rs | 10 | ||||
| -rw-r--r-- | src/test/debug-info/managed-enum.rs | 12 | ||||
| -rw-r--r-- | src/test/debug-info/multiple-functions-equal-var-names.rs | 18 | ||||
| -rw-r--r-- | src/test/debug-info/multiple-functions.rs | 18 | ||||
| -rw-r--r-- | src/test/debug-info/packed-struct-with-destructor.rs | 1 | ||||
| -rw-r--r-- | src/test/debug-info/packed-struct.rs | 1 | ||||
| -rw-r--r-- | src/test/debug-info/struct-in-enum.rs | 9 | ||||
| -rw-r--r-- | src/test/debug-info/struct-style-enum.rs | 1 | ||||
| -rw-r--r-- | src/test/debug-info/tuple-style-enum.rs | 3 | ||||
| -rw-r--r-- | src/test/debug-info/unique-enum.rs | 12 |
15 files changed, 61 insertions, 43 deletions
diff --git a/src/test/debug-info/borrowed-enum.rs b/src/test/debug-info/borrowed-enum.rs index ae80cdd7822..e6094fdef9f 100644 --- a/src/test/debug-info/borrowed-enum.rs +++ b/src/test/debug-info/borrowed-enum.rs @@ -31,8 +31,8 @@ // the size of the discriminant value is machine dependent, this has be taken into account when // datatype layout should be predictable as in this case. enum ABC { - TheA { x: i64, y: i64 }, - TheB (i64, i32, i32), + TheA { x: i64, y: i64 }, + TheB (i64, i32, i32), } // This is a special case since it does not have the implicit discriminant field. @@ -42,10 +42,10 @@ enum Univariant { fn main() { - // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 - // 0b01111100011111000111110001111100 = 2088533116 - // 0b0111110001111100 = 31868 - // 0b01111100 = 124 + // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 + // 0b01111100011111000111110001111100 = 2088533116 + // 0b0111110001111100 = 31868 + // 0b01111100 = 124 let the_a = TheA { x: 0, y: 8970181431921507452 }; let the_a_ref: &ABC = &the_a; diff --git a/src/test/debug-info/destructured-fn-argument.rs b/src/test/debug-info/destructured-fn-argument.rs index 0485a5ba022..ed711e2ca0b 100644 --- a/src/test/debug-info/destructured-fn-argument.rs +++ b/src/test/debug-info/destructured-fn-argument.rs @@ -232,7 +232,8 @@ fn different_order_of_struct_fields(Struct { b: s, a: t }: Struct ) { } fn complex_nesting(((u, v ), ((w, (x, Struct { a: y, b: z})), Struct { a: ae, b: oe }), ue ): - ((i16, i32), ((i64, (i32, Struct, )), Struct ), u16)) { + ((i16, i32), ((i64, (i32, Struct, )), Struct ), u16)) +{ zzz(); } diff --git a/src/test/debug-info/generic-struct-style-enum.rs b/src/test/debug-info/generic-struct-style-enum.rs index cd7bd57795c..5930af11567 100644 --- a/src/test/debug-info/generic-struct-style-enum.rs +++ b/src/test/debug-info/generic-struct-style-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info diff --git a/src/test/debug-info/generic-tuple-style-enum.rs b/src/test/debug-info/generic-tuple-style-enum.rs index 03f1a695667..0a737ffe073 100644 --- a/src/test/debug-info/generic-tuple-style-enum.rs +++ b/src/test/debug-info/generic-tuple-style-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info diff --git a/src/test/debug-info/include_string.rs b/src/test/debug-info/include_string.rs index a13dde22710..74064bb5782 100644 --- a/src/test/debug-info/include_string.rs +++ b/src/test/debug-info/include_string.rs @@ -24,7 +24,7 @@ #[allow(unused_variable)]; -// This test case makes sure that debug info does not ICE when include_str is +// This test case makes sure that debug info does not ICE when include_str is // used multiple times (see issue #11322). fn main() { diff --git a/src/test/debug-info/issue11600.rs b/src/test/debug-info/issue11600.rs index 425aff8d441..00e240d147c 100644 --- a/src/test/debug-info/issue11600.rs +++ b/src/test/debug-info/issue11600.rs @@ -1,3 +1,13 @@ +// Copyright 2014 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 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + fn main() { let args : ~[~str] = ::std::os::args(); ::std::io::println(args[0]); diff --git a/src/test/debug-info/managed-enum.rs b/src/test/debug-info/managed-enum.rs index 5ab39e00eb3..ef94fd3e331 100644 --- a/src/test/debug-info/managed-enum.rs +++ b/src/test/debug-info/managed-enum.rs @@ -31,8 +31,8 @@ // the size of the discriminant value is machine dependent, this has be taken into account when // datatype layout should be predictable as in this case. enum ABC { - TheA { x: i64, y: i64 }, - TheB (i64, i32, i32), + TheA { x: i64, y: i64 }, + TheB (i64, i32, i32), } // This is a special case since it does not have the implicit discriminant field. @@ -46,10 +46,10 @@ fn main() { // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. - // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 - // 0b01111100011111000111110001111100 = 2088533116 - // 0b0111110001111100 = 31868 - // 0b01111100 = 124 + // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 + // 0b01111100011111000111110001111100 = 2088533116 + // 0b0111110001111100 = 31868 + // 0b01111100 = 124 let the_a = @TheA { x: 0, y: 8970181431921507452 }; // 0b0001000100010001000100010001000100010001000100010001000100010001 = 1229782938247303441 diff --git a/src/test/debug-info/multiple-functions-equal-var-names.rs b/src/test/debug-info/multiple-functions-equal-var-names.rs index b0d9b0aa884..29a7de4a316 100644 --- a/src/test/debug-info/multiple-functions-equal-var-names.rs +++ b/src/test/debug-info/multiple-functions-equal-var-names.rs @@ -31,26 +31,26 @@ #[allow(unused_variable)]; fn function_one() { - let abc = 10101; - zzz(); + let abc = 10101; + zzz(); } fn function_two() { - let abc = 20202; - zzz(); + let abc = 20202; + zzz(); } fn function_three() { - let abc = 30303; - zzz(); + let abc = 30303; + zzz(); } fn main() { - function_one(); - function_two(); - function_three(); + function_one(); + function_two(); + function_three(); } fn zzz() {()} diff --git a/src/test/debug-info/multiple-functions.rs b/src/test/debug-info/multiple-functions.rs index 29d67c17684..f5abe6e249d 100644 --- a/src/test/debug-info/multiple-functions.rs +++ b/src/test/debug-info/multiple-functions.rs @@ -31,26 +31,26 @@ #[allow(unused_variable)]; fn function_one() { - let a = 10101; - zzz(); + let a = 10101; + zzz(); } fn function_two() { - let b = 20202; - zzz(); + let b = 20202; + zzz(); } fn function_three() { - let c = 30303; - zzz(); + let c = 30303; + zzz(); } fn main() { - function_one(); - function_two(); - function_three(); + function_one(); + function_two(); + function_three(); } fn zzz() {()} diff --git a/src/test/debug-info/packed-struct-with-destructor.rs b/src/test/debug-info/packed-struct-with-destructor.rs index 1a0532887bf..5e6480fa8c5 100644 --- a/src/test/debug-info/packed-struct-with-destructor.rs +++ b/src/test/debug-info/packed-struct-with-destructor.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info diff --git a/src/test/debug-info/packed-struct.rs b/src/test/debug-info/packed-struct.rs index 6ee2574ca74..795b9d275dd 100644 --- a/src/test/debug-info/packed-struct.rs +++ b/src/test/debug-info/packed-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info diff --git a/src/test/debug-info/struct-in-enum.rs b/src/test/debug-info/struct-in-enum.rs index 98ded437273..b706ad1c38c 100644 --- a/src/test/debug-info/struct-in-enum.rs +++ b/src/test/debug-info/struct-in-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info @@ -28,9 +29,9 @@ #[allow(unused_variable)]; struct Struct { - x: u32, - y: i32, - z: i16 + x: u32, + y: i32, + z: i16 } // The first element is to ensure proper alignment, irrespective of the machines word size. Since @@ -42,7 +43,7 @@ enum Regular { } enum Univariant { - TheOnlyCase(Struct) + TheOnlyCase(Struct) } fn main() { diff --git a/src/test/debug-info/struct-style-enum.rs b/src/test/debug-info/struct-style-enum.rs index fbdf99dd241..d7804da7894 100644 --- a/src/test/debug-info/struct-style-enum.rs +++ b/src/test/debug-info/struct-style-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info diff --git a/src/test/debug-info/tuple-style-enum.rs b/src/test/debug-info/tuple-style-enum.rs index e6a89adbd9c..c9d577a2491 100644 --- a/src/test/debug-info/tuple-style-enum.rs +++ b/src/test/debug-info/tuple-style-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-tidy-linelength // xfail-android: FIXME(#10381) // compile-flags:-Z extra-debug-info @@ -40,7 +41,7 @@ enum Regular { } enum Univariant { - TheOnlyCase(i64) + TheOnlyCase(i64) } fn main() { diff --git a/src/test/debug-info/unique-enum.rs b/src/test/debug-info/unique-enum.rs index 66fa8e183e9..647a6e55f98 100644 --- a/src/test/debug-info/unique-enum.rs +++ b/src/test/debug-info/unique-enum.rs @@ -31,8 +31,8 @@ // the size of the discriminant value is machine dependent, this has be taken into account when // datatype layout should be predictable as in this case. enum ABC { - TheA { x: i64, y: i64 }, - TheB (i64, i32, i32), + TheA { x: i64, y: i64 }, + TheB (i64, i32, i32), } // This is a special case since it does not have the implicit discriminant field. @@ -46,10 +46,10 @@ fn main() { // repeated byte. This way each interpretation of the union should look the same, no matter if // this is a big or little endian machine. - // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 - // 0b01111100011111000111110001111100 = 2088533116 - // 0b0111110001111100 = 31868 - // 0b01111100 = 124 + // 0b0111110001111100011111000111110001111100011111000111110001111100 = 8970181431921507452 + // 0b01111100011111000111110001111100 = 2088533116 + // 0b0111110001111100 = 31868 + // 0b01111100 = 124 let the_a = ~TheA { x: 0, y: 8970181431921507452 }; // 0b0001000100010001000100010001000100010001000100010001000100010001 = 1229782938247303441 |
