Skip to content

Commit 7765993

Browse files
committed
auto merge of #19124 : Kintaro/rust/remove_test_struct_variants, r=bstrie
Removed usage of struct_variant feature from all tests.
2 parents 8296808 + f950e3c commit 7765993

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+6
-76
lines changed

src/test/auxiliary/issue-8044.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(struct_variant)]
12-
1311
pub struct BTree<V> {
1412
pub node: TreeItem<V>,
1513
}

src/test/auxiliary/namespaced_enum_emulate_flat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
#![feature(globs, struct_variant)]
10+
#![feature(globs)]
1111

1212
pub use Foo::*;
1313

src/test/auxiliary/namespaced_enums.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
#![feature(struct_variant)]
1110

1211
pub enum Foo {
1312
A,

src/test/auxiliary/struct_variant_privacy.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
#![feature(struct_variant)]
1110

1211
enum Bar {
1312
Baz { a: int }

src/test/auxiliary/struct_variant_xc_aux.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#![crate_name="struct_variant_xc_aux"]
1212
#![crate_type = "lib"]
1313

14-
#![feature(struct_variant)]
15-
1614
pub enum Enum {
1715
Variant(u8),
1816
StructVariant { arg: u8 }

src/test/debuginfo/borrowed-enum.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
// lldb-check:[...]$2 = TheOnlyCase(4820353753753434)
4141

4242
#![allow(unused_variables)]
43-
#![feature(struct_variant)]
4443

4544
// The first element is to ensure proper alignment, irrespective of the machines word size. Since
4645
// the size of the discriminant value is machine dependent, this has be taken into account when

src/test/debuginfo/by-value-non-immediate-argument.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
// lldb-check:[...]$6 = Case1 { x: 0, y: 8970181431921507452 }
7272
// lldb-command:continue
7373

74-
#![feature(struct_variant)]
75-
7674
#[deriving(Clone)]
7775
struct Struct {
7876
a: int,

src/test/debuginfo/gdb-pretty-struct-and-enums.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
// gdb-command: print nested_variant2
6565
// gdb-check:$14 = NestedVariant2 = {abc = NestedStruct = {regular_struct = RegularStruct = {the_first_field = 117, the_second_field = 118.5, the_third_field = false, the_fourth_field = "NestedStructString10"}, tuple_struct = TupleStruct = {119.5, 120}, empty_struct = EmptyStruct, c_style_enum = CStyleEnumVar3, mixed_enum = MixedEnumStructVar = {field1 = 121.5, field2 = -122}}}
6666

67-
#![feature(struct_variant)]
68-
6967
use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3};
7068
use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar};
7169
use self::NestedEnum::{NestedVariant1, NestedVariant2};

src/test/debuginfo/generic-static-method-on-struct-and-enum.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
// gdb-check:$5 = 5
3232
// gdb-command:continue
3333

34-
#![feature(struct_variant)]
35-
3634
struct Struct {
3735
x: int
3836
}

src/test/debuginfo/generic-struct-style-enum.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
// gdb-command:print univariant
3030
// gdb-check:$4 = {{a = -1}}
3131

32-
#![feature(struct_variant)]
33-
3432
use self::Regular::{Case1, Case2, Case3};
3533
use self::Univariant::TheOnlyCase;
3634

0 commit comments

Comments
 (0)