about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-25 07:24:18 +0000
committerbors <bors@rust-lang.org>2017-05-25 07:24:18 +0000
commitd0811c9148ff4fa15aba69e7fb11d7ec5dabbe8d (patch)
treebb1c51ef78c46bf617f646c6cd7b701525bca8ad /src/test
parentffb0e2dba38adb0bacf6636719bfe709286851fd (diff)
parent6627ef228c1396c045b3e9f24edaf66b76516cbd (diff)
downloadrust-d0811c9148ff4fa15aba69e7fb11d7ec5dabbe8d.tar.gz
rust-d0811c9148ff4fa15aba69e7fb11d7ec5dabbe8d.zip
Auto merge of #41145 - matthewjasper:stabilize-relaxed-adts, r=petrochenkov
Stabilize rfc 1506 - Clarified ADT Kinds

Closes #35626

Documentation:

- [ ] Reference rust-lang-nursery/reference#37
- [ ] Book?
- [ ] Rust by example?
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/numeric-fields-feature-gate.rs20
-rw-r--r--src/test/compile-fail/numeric-fields.rs2
-rw-r--r--src/test/run-pass/numeric-fields.rs2
3 files changed, 0 insertions, 24 deletions
diff --git a/src/test/compile-fail/numeric-fields-feature-gate.rs b/src/test/compile-fail/numeric-fields-feature-gate.rs
deleted file mode 100644
index bd8ec16ef88..00000000000
--- a/src/test/compile-fail/numeric-fields-feature-gate.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 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.
-
-// gate-test-relaxed_adts
-
-struct S(u8);
-
-fn main() {
-    let s = S{0: 10}; //~ ERROR numeric fields in struct expressions are unstable
-    match s {
-        S{0: a, ..} => {} //~ ERROR numeric fields in struct patterns are unstable
-    }
-}
diff --git a/src/test/compile-fail/numeric-fields.rs b/src/test/compile-fail/numeric-fields.rs
index 0dc5c4bcfa2..00fde3025a6 100644
--- a/src/test/compile-fail/numeric-fields.rs
+++ b/src/test/compile-fail/numeric-fields.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(relaxed_adts)]
-
 struct S(u8, u16);
 
 fn main() {
diff --git a/src/test/run-pass/numeric-fields.rs b/src/test/run-pass/numeric-fields.rs
index 25e5a2a0fd5..15f054de79d 100644
--- a/src/test/run-pass/numeric-fields.rs
+++ b/src/test/run-pass/numeric-fields.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(relaxed_adts)]
-
 struct S(u8, u16);
 
 fn main() {