about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-22 04:06:45 +0000
committerbors <bors@rust-lang.org>2014-11-22 04:06:45 +0000
commit2a4c0100fe5eead03b8b566748c1909a7b9b903b (patch)
tree53fef18d9ef0450d921e58fa17dd1e71d282e6d9 /src
parent2af82f75304b267167ad27368f410b4cb5daf1f5 (diff)
parent4a83726517009688440ac99771560968d33d015c (diff)
downloadrust-2a4c0100fe5eead03b8b566748c1909a7b9b903b.tar.gz
rust-2a4c0100fe5eead03b8b566748c1909a7b9b903b.zip
auto merge of #19122 : Kintaro/rust/remove_struct_variant, r=jakub-
The struct_variant is not gated anymore. This commit just removes it and the resulting warnings when compiling rust. Now compiles with the snapshot from 11/18 (as opposed to PR #19014)
Diffstat (limited to 'src')
-rw-r--r--src/librustc/lib.rs2
-rw-r--r--src/librustc_trans/lib.rs2
-rw-r--r--src/librustdoc/lib.rs2
-rw-r--r--src/libsyntax/lib.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 0da9b05d4f8..f272bb52a14 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -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;
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index ad9333e5794..f89580b768e 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -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;
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 54e9196d8a9..8770e473dea 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -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;
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index fa10cb90f83..c9d72603b89 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -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;