about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-16 10:59:40 +0000
committerbors <bors@rust-lang.org>2018-06-16 10:59:40 +0000
commit61ba0180933485cf8a2bc6b7230a4c70b82bb063 (patch)
tree5aff6e18e3b8252bbc742272ad633866b779c912 /src/test
parenta385095f9a6d4d068102b6c72fbdc86ac2667e51 (diff)
parente2aef92c19a95d6a0b8e75b473023f77de6150f0 (diff)
downloadrust-61ba0180933485cf8a2bc6b7230a4c70b82bb063.tar.gz
rust-61ba0180933485cf8a2bc6b7230a4c70b82bb063.zip
Auto merge of #51562 - SimonSapin:transparent, r=cramertj
Stabilize #[repr(transparent)]

Tracking issue FCP: https://github.com/rust-lang/rust/issues/43036#issuecomment-394094318
Reference PR: https://github.com/rust-lang-nursery/reference/pull/353
Diffstat (limited to 'src/test')
-rw-r--r--src/test/codegen/repr-transparent-aggregates-1.rs1
-rw-r--r--src/test/codegen/repr-transparent-aggregates-2.rs1
-rw-r--r--src/test/codegen/repr-transparent-aggregates-3.rs1
-rw-r--r--src/test/codegen/repr-transparent-sysv64.rs1
-rw-r--r--src/test/codegen/repr-transparent.rs2
-rw-r--r--src/test/compile-fail/repr-transparent-other-items.rs2
-rw-r--r--src/test/compile-fail/repr-transparent-other-reprs.rs2
-rw-r--r--src/test/compile-fail/repr-transparent.rs1
-rw-r--r--src/test/ui/feature-gate-repr_transparent.rs14
-rw-r--r--src/test/ui/feature-gate-repr_transparent.stderr11
-rw-r--r--src/test/ui/lint-ctypes.rs2
11 files changed, 3 insertions, 35 deletions
diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs
index 2eeed2b788c..a1185cc1e2e 100644
--- a/src/test/codegen/repr-transparent-aggregates-1.rs
+++ b/src/test/codegen/repr-transparent-aggregates-1.rs
@@ -18,7 +18,6 @@
 // See repr-transparent.rs
 
 #![crate_type="lib"]
-#![feature(repr_transparent)]
 
 
 #[repr(C)]
diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/src/test/codegen/repr-transparent-aggregates-2.rs
index 25750a6513f..bc000bd3165 100644
--- a/src/test/codegen/repr-transparent-aggregates-2.rs
+++ b/src/test/codegen/repr-transparent-aggregates-2.rs
@@ -22,7 +22,6 @@
 // See repr-transparent.rs
 
 #![crate_type="lib"]
-#![feature(repr_transparent)]
 
 
 #[repr(C)]
diff --git a/src/test/codegen/repr-transparent-aggregates-3.rs b/src/test/codegen/repr-transparent-aggregates-3.rs
index 0c90239c9de..a292f1d70f3 100644
--- a/src/test/codegen/repr-transparent-aggregates-3.rs
+++ b/src/test/codegen/repr-transparent-aggregates-3.rs
@@ -14,7 +14,6 @@
 // See repr-transparent.rs
 
 #![crate_type="lib"]
-#![feature(repr_transparent)]
 
 
 #[repr(C)]
diff --git a/src/test/codegen/repr-transparent-sysv64.rs b/src/test/codegen/repr-transparent-sysv64.rs
index 7a30983fdd3..2e4665e22e3 100644
--- a/src/test/codegen/repr-transparent-sysv64.rs
+++ b/src/test/codegen/repr-transparent-sysv64.rs
@@ -13,7 +13,6 @@
 // compile-flags: -C no-prepopulate-passes
 
 #![crate_type="lib"]
-#![feature(repr_transparent)]
 
 #[repr(C)]
 pub struct Rgb8 { r: u8, g: u8, b: u8 }
diff --git a/src/test/codegen/repr-transparent.rs b/src/test/codegen/repr-transparent.rs
index 087fa9b16b4..64a62fd7e88 100644
--- a/src/test/codegen/repr-transparent.rs
+++ b/src/test/codegen/repr-transparent.rs
@@ -11,7 +11,7 @@
 // compile-flags: -C no-prepopulate-passes
 
 #![crate_type="lib"]
-#![feature(repr_transparent, repr_simd)]
+#![feature(repr_simd)]
 
 use std::marker::PhantomData;
 
diff --git a/src/test/compile-fail/repr-transparent-other-items.rs b/src/test/compile-fail/repr-transparent-other-items.rs
index cf0870866c7..685d62dc3a9 100644
--- a/src/test/compile-fail/repr-transparent-other-items.rs
+++ b/src/test/compile-fail/repr-transparent-other-items.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(repr_transparent)]
-
 // See also repr-transparent.rs
 
 #[repr(transparent)] //~ ERROR unsupported representation for zero-variant enum
diff --git a/src/test/compile-fail/repr-transparent-other-reprs.rs b/src/test/compile-fail/repr-transparent-other-reprs.rs
index 7b91a6f68e3..a391c0ae1f8 100644
--- a/src/test/compile-fail/repr-transparent-other-reprs.rs
+++ b/src/test/compile-fail/repr-transparent-other-reprs.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(repr_transparent, repr_align, attr_literals)]
+#![feature(repr_align, attr_literals)]
 
 // See also repr-transparent.rs
 
diff --git a/src/test/compile-fail/repr-transparent.rs b/src/test/compile-fail/repr-transparent.rs
index b5e6a0fa0b1..4d8ec4cdb40 100644
--- a/src/test/compile-fail/repr-transparent.rs
+++ b/src/test/compile-fail/repr-transparent.rs
@@ -14,7 +14,6 @@
 // - repr-transparent-other-items.rs
 
 #![feature(repr_align, attr_literals)]
-#![feature(repr_transparent)]
 
 use std::marker::PhantomData;
 
diff --git a/src/test/ui/feature-gate-repr_transparent.rs b/src/test/ui/feature-gate-repr_transparent.rs
deleted file mode 100644
index deadf2e535d..00000000000
--- a/src/test/ui/feature-gate-repr_transparent.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 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.
-
-#[repr(transparent)] //~ error: the `#[repr(transparent)]` attribute is experimental
-struct Foo(u64);
-
-fn main() {}
diff --git a/src/test/ui/feature-gate-repr_transparent.stderr b/src/test/ui/feature-gate-repr_transparent.stderr
deleted file mode 100644
index a4ffaa26690..00000000000
--- a/src/test/ui/feature-gate-repr_transparent.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0658]: the `#[repr(transparent)]` attribute is experimental (see issue #43036)
-  --> $DIR/feature-gate-repr_transparent.rs:11:1
-   |
-LL | #[repr(transparent)] //~ error: the `#[repr(transparent)]` attribute is experimental
-   | ^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add #![feature(repr_transparent)] to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/lint-ctypes.rs b/src/test/ui/lint-ctypes.rs
index 85957831653..4b20001457f 100644
--- a/src/test/ui/lint-ctypes.rs
+++ b/src/test/ui/lint-ctypes.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![deny(improper_ctypes)]
-#![feature(libc, repr_transparent)]
+#![feature(libc)]
 
 extern crate libc;