Skip to content

Remove struct_variants from tests #19124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This API is completely unstable and subject to change.
html_root_url = "http://doc.rust-lang.org/nightly/")]

#![feature(default_type_params, globs, if_let, import_shadowing, macro_rules, phase, quote)]
#![feature(slicing_syntax, struct_variant, tuple_indexing, unsafe_destructor)]
#![feature(slicing_syntax, tuple_indexing, unsafe_destructor)]
#![feature(rustc_diagnostic_macros)]

extern crate arena;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_trans/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This API is completely unstable and subject to change.
html_root_url = "http://doc.rust-lang.org/nightly/")]

#![feature(default_type_params, globs, if_let, import_shadowing, macro_rules, phase, quote)]
#![feature(slicing_syntax, struct_variant, unsafe_destructor)]
#![feature(slicing_syntax, unsafe_destructor)]
#![feature(rustc_diagnostic_macros)]

extern crate arena;
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#![crate_type = "rlib"]

#![allow(unknown_features)]
#![feature(globs, struct_variant, macro_rules, phase, slicing_syntax, tuple_indexing)]
#![feature(globs, macro_rules, phase, slicing_syntax, tuple_indexing)]

extern crate arena;
extern crate getopts;
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#![allow(unknown_features)]
#![feature(if_let, macro_rules, globs, default_type_params, phase, slicing_syntax)]
#![feature(quote, struct_variant, unsafe_destructor, import_shadowing)]
#![feature(quote, unsafe_destructor, import_shadowing)]

extern crate arena;
extern crate fmt_macros;
Expand Down
2 changes: 0 additions & 2 deletions src/test/auxiliary/issue-8044.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

pub struct BTree<V> {
pub node: TreeItem<V>,
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/auxiliary/namespaced_enum_emulate_flat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// <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.
#![feature(globs, struct_variant)]
#![feature(globs)]

pub use Foo::*;

Expand Down
1 change: 0 additions & 1 deletion src/test/auxiliary/namespaced_enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// <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.
#![feature(struct_variant)]

pub enum Foo {
A,
Expand Down
1 change: 0 additions & 1 deletion src/test/auxiliary/struct_variant_privacy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// <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.
#![feature(struct_variant)]

enum Bar {
Baz { a: int }
Expand Down
2 changes: 0 additions & 2 deletions src/test/auxiliary/struct_variant_xc_aux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#![crate_name="struct_variant_xc_aux"]
#![crate_type = "lib"]

#![feature(struct_variant)]

pub enum Enum {
Variant(u8),
StructVariant { arg: u8 }
Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/borrowed-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
// lldb-check:[...]$2 = TheOnlyCase(4820353753753434)

#![allow(unused_variables)]
#![feature(struct_variant)]

// The first element is to ensure proper alignment, irrespective of the machines word size. Since
// the size of the discriminant value is machine dependent, this has be taken into account when
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/by-value-non-immediate-argument.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
// lldb-check:[...]$6 = Case1 { x: 0, y: 8970181431921507452 }
// lldb-command:continue

#![feature(struct_variant)]

#[deriving(Clone)]
struct Struct {
a: int,
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/gdb-pretty-struct-and-enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@
// gdb-command: print nested_variant2
// 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}}}

#![feature(struct_variant)]

use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3};
use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar};
use self::NestedEnum::{NestedVariant1, NestedVariant2};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
// gdb-check:$5 = 5
// gdb-command:continue

#![feature(struct_variant)]

struct Struct {
x: int
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/generic-struct-style-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
// gdb-command:print univariant
// gdb-check:$4 = {{a = -1}}

#![feature(struct_variant)]

use self::Regular::{Case1, Case2, Case3};
use self::Univariant::TheOnlyCase;

Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/method-on-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@
// lldb-check:[...]$14 = -10
// lldb-command:continue

#![feature(struct_variant)]

enum Enum {
Variant1 { x: u16, y: u16 },
Variant2 (u32)
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/option-like-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
// lldb-check:[...]$5 = Void


#![feature(struct_variant)]

// If a struct has exactly two variants, one of them is empty, and the other one
// contains a non-nullable pointer, then this value is used as the discriminator.
// The test cases in this file make sure that something readable is generated for
Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/recursive-struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
// gdb-command:continue

#![allow(unused_variables)]
#![feature(struct_variant)]

use self::Opt::{Empty, Val};

Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/static-method-on-struct-and-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
// lldb-check:[...]$4 = 5
// lldb-command:continue

#![feature(struct_variant)]

struct Struct {
x: int
}
Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/struct-style-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
// lldb-check:[...]$3 = TheOnlyCase { a: -1 }

#![allow(unused_variables)]
#![feature(struct_variant)]

use self::Regular::{Case1, Case2, Case3};
use self::Univariant::TheOnlyCase;
Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/unique-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
// lldb-check:[...]$2 = TheOnlyCase(123234)

#![allow(unused_variables)]
#![feature(struct_variant)]

// The first element is to ensure proper alignment, irrespective of the machines word size. Since
// the size of the discriminant value is machine dependent, this has be taken into account when
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/const-enum-structlike.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

enum E {
S0 { s: String },
S1 { u: uint }
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/deriving-cmp-generic-struct-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// no-pretty-expanded FIXME #15189

#![feature(struct_variant)]

#[deriving(PartialEq, Eq, PartialOrd, Ord)]
enum ES<T> {
ES1 { x: T },
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/deriving-encodable-decodable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

// ignore-test FIXME(#5121)

#![feature(struct_variant)]

extern crate rand;
extern crate rbml;
extern crate serialize;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/deriving-rand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

use std::rand;

#[deriving(Rand)]
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/deriving-show-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

use std::fmt;

#[deriving(Show)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/deriving-show.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant, macro_rules)]
#![feature(macro_rules)]

#[deriving(Show)]
struct Unit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

#[deriving(PartialEq, Show)]
enum S {
X { x: int, y: int },
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/drop-trait-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

use std::task;

#[deriving(PartialEq, Show)]
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/enum-variants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#![allow(dead_assignment)]
#![allow(unused_variable)]
#![feature(struct_variant)]

enum Animal {
Dog (String, f64),
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-11085.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// compile-flags: --cfg foo

#![feature(struct_variant)]

struct Foo {
#[cfg(fail)]
bar: baz,
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-11577.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

// Destructuring struct variants would ICE where regular structs wouldn't

enum Foo {
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-14837.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

#[deny(dead_code)]
pub enum Foo {
Bar {
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-5530.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

enum Enum {
Foo { foo: uint },
Bar { bar: uint }
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-8351-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

enum E {
Foo{f: int},
Bar,
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/issue-8351-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

enum E {
Foo{f: int, b: bool},
Bar,
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/match-arm-statics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

struct NewBool(bool);

enum Direction {
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/match-enum-struct-0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// regression test for issue #5625

#![feature(struct_variant)]

enum E {
Foo{f : int},
Bar
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/match-enum-struct-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(struct_variant)]

enum E {
Foo{f : int},
Bar
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/match-in-macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(macro_rules, struct_variant)]
#![feature(macro_rules)]

enum Foo {
B { b1: int, bb1: int},
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/namespaced-enum-emulate-flat-xc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// aux-build:namespaced_enum_emulate_flat.rs
#![feature(struct_variant)]

extern crate namespaced_enum_emulate_flat;

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/namespaced-enum-emulate-flat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// <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.
#![feature(globs, struct_variant)]
#![feature(globs)]

pub use Foo::*;
use nest::{Bar, D, E, F};
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/namespaced-enum-glob-import-xcrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

// aux-build:namespaced_enums.rs
#![feature(globs, struct_variant)]
#![feature(globs)]

extern crate namespaced_enums;

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/namespaced-enum-glob-import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// <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.
#![feature(globs, struct_variant)]
#![feature(globs)]

mod m2 {
pub enum Foo {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/namespaced-enums-xcrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// aux-build:namespaced_enums.rs
#![feature(struct_variant)]

extern crate namespaced_enums;

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/namespaced-enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// <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.
#![feature(struct_variant)]

enum Foo {
A,
Expand Down
Loading