Skip to content

Commit

Permalink
Rollup merge of rust-lang#57049 - cramertj:repr-packed, r=Centril
Browse files Browse the repository at this point in the history
Stabilize #[repr(packed(N))]

Fixes rust-lang#33158
  • Loading branch information
kennytm committed Dec 22, 2018
2 parents e4430e0 + e5e19d9 commit 60b4ea0
Show file tree
Hide file tree
Showing 19 changed files with 18 additions and 91 deletions.
8 changes: 0 additions & 8 deletions src/doc/unstable-book/src/language-features/repr-packed.md

This file was deleted.

12 changes: 2 additions & 10 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,6 @@ declare_features! (
// Multiple patterns with `|` in `if let` and `while let`.
(active, if_while_or_patterns, "1.26.0", Some(48215), None),

// Allows `#[repr(packed)]` attribute on structs.
(active, repr_packed, "1.26.0", Some(33158), None),

// Allows macro invocations in `extern {}` blocks.
(active, macros_in_extern, "1.27.0", Some(49476), None),

Expand Down Expand Up @@ -695,6 +692,8 @@ declare_features! (
(accepted, self_in_typedefs, "1.32.0", Some(49303), None),
// `use path as _;` and `extern crate c as _;`
(accepted, underscore_imports, "1.33.0", Some(48216), None),
// Allows `#[repr(packed(N))]` attribute on structs.
(accepted, repr_packed, "1.33.0", Some(33158), None),
);

// If you change this, please modify `src/doc/unstable-book` as well. You must
Expand Down Expand Up @@ -1588,13 +1587,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
gate_feature_post!(&self, repr_simd, attr.span,
"SIMD types are experimental and possibly buggy");
}
if let Some((name, _)) = item.name_value_literal() {
if name == "packed" {
gate_feature_post!(&self, repr_packed, attr.span,
"the `#[repr(packed(n))]` attribute \
is experimental");
}
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/test/codegen/packed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
// min-llvm-version 7.0

#![crate_type = "lib"]
#![feature(repr_packed)]

#[repr(packed)]
pub struct Packed1 {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/issues/issue-48159.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// run-pass
#![feature(repr_packed)]
#![allow(non_camel_case_types)]

use std::mem;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/packed/auxiliary/packed.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(repr_packed)]

#[repr(packed)]
pub struct P1S5 {
a: u8,
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/packed/packed-struct-borrow-element.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#![allow(dead_code)]
// ignore-emscripten weird assertion?

#![feature(repr_packed)]

#[repr(packed)]
struct Foo1 {
bar: u8,
Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/packed/packed-struct-generic-size.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@

// run-pass
#![allow(dead_code)]
#![allow(stable_features)]
#![allow(unused_comparisons)]

#![feature(repr_packed)]

use std::mem;

#[repr(packed)]
Expand Down
12 changes: 6 additions & 6 deletions src/test/run-pass/packed/packed-struct-generic-size.stderr
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:49:14
--> $DIR/packed-struct-generic-size.rs:46:14
|
LL | check!(P1::<u8, u8>, 1, 3);
| ^^ try removing `::`

warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:50:14
--> $DIR/packed-struct-generic-size.rs:47:14
|
LL | check!(P1::<u64, u16>, 1, 11);
| ^^ try removing `::`

warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:52:14
--> $DIR/packed-struct-generic-size.rs:49:14
|
LL | check!(P2::<u8, u8>, 1, 3);
| ^^ try removing `::`

warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:53:14
--> $DIR/packed-struct-generic-size.rs:50:14
|
LL | check!(P2::<u64, u16>, 2, 12);
| ^^ try removing `::`

warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:55:15
--> $DIR/packed-struct-generic-size.rs:52:15
|
LL | check!(P4C::<u8, u8>, 1, 3);
| ^^ try removing `::`

warning: unnecessary path disambiguator
--> $DIR/packed-struct-generic-size.rs:56:15
--> $DIR/packed-struct-generic-size.rs:53:15
|
LL | check!(P4C::<u16, u64>, 4, 12);
| ^^ try removing `::`
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/packed/packed-struct-match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// run-pass
#![feature(repr_packed)]

#[repr(packed)]
struct Foo1 {
Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/packed/packed-struct-size.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
#![allow(non_camel_case_types)]
#![allow(non_upper_case_globals)]

#![feature(repr_packed)]


use std::mem;

#[repr(packed)]
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/packed/packed-struct-vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

// run-pass
#![feature(repr_packed)]

use std::fmt;
use std::mem;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/packed/packed-tuple-struct-size.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#![allow(dead_code)]
#![allow(non_camel_case_types)]

#![feature(repr_packed)]

use std::mem;

#[repr(packed)]
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/structs-enums/align-struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// run-pass
#![allow(dead_code)]
#![feature(box_syntax)]
#![feature(repr_packed)]

use std::mem;

Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/union/union-packed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#![allow(non_snake_case)]

#![feature(untagged_unions)]
#![feature(repr_packed)]

use std::mem::{size_of, size_of_val, align_of, align_of_val};

Expand Down
1 change: 0 additions & 1 deletion src/test/ui/conflicting-repr-hints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

#![allow(dead_code)]
#![feature(repr_packed)]

#[repr(C)]
enum A { A }
Expand Down
20 changes: 10 additions & 10 deletions src/test/ui/conflicting-repr-hints.stderr
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
warning[E0566]: conflicting representation hints
--> $DIR/conflicting-repr-hints.rs:20:8
--> $DIR/conflicting-repr-hints.rs:19:8
|
LL | #[repr(C, u64)] //~ WARNING conflicting representation hints
| ^ ^^^

warning[E0566]: conflicting representation hints
--> $DIR/conflicting-repr-hints.rs:23:8
--> $DIR/conflicting-repr-hints.rs:22:8
|
LL | #[repr(u32, u64)] //~ WARNING conflicting representation hints
| ^^^ ^^^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:30:1
--> $DIR/conflicting-repr-hints.rs:29:1
|
LL | struct F(i32); //~ ERROR type has conflicting packed and align representation hints
| ^^^^^^^^^^^^^^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:34:1
--> $DIR/conflicting-repr-hints.rs:33:1
|
LL | struct G(i32); //~ ERROR type has conflicting packed and align representation hints
| ^^^^^^^^^^^^^^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:38:1
--> $DIR/conflicting-repr-hints.rs:37:1
|
LL | struct H(i32); //~ ERROR type has conflicting packed and align representation hints
| ^^^^^^^^^^^^^^

error[E0634]: type has conflicting packed representation hints
--> $DIR/conflicting-repr-hints.rs:41:1
--> $DIR/conflicting-repr-hints.rs:40:1
|
LL | struct I(i32); //~ ERROR type has conflicting packed representation hints
| ^^^^^^^^^^^^^^

error[E0634]: type has conflicting packed representation hints
--> $DIR/conflicting-repr-hints.rs:45:1
--> $DIR/conflicting-repr-hints.rs:44:1
|
LL | struct J(i32); //~ ERROR type has conflicting packed representation hints
| ^^^^^^^^^^^^^^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:51:1
--> $DIR/conflicting-repr-hints.rs:50:1
|
LL | / union X { //~ ERROR type has conflicting packed and align representation hints
LL | | i: i32
LL | | }
| |_^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:57:1
--> $DIR/conflicting-repr-hints.rs:56:1
|
LL | / union Y { //~ ERROR type has conflicting packed and align representation hints
LL | | i: i32
LL | | }
| |_^

error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:63:1
--> $DIR/conflicting-repr-hints.rs:62:1
|
LL | / union Z { //~ ERROR type has conflicting packed and align representation hints
LL | | i: i32
Expand Down
18 changes: 0 additions & 18 deletions src/test/ui/feature-gates/feature-gate-repr_packed.rs

This file was deleted.

19 changes: 0 additions & 19 deletions src/test/ui/feature-gates/feature-gate-repr_packed.stderr

This file was deleted.

1 change: 0 additions & 1 deletion src/test/ui/print_type_sizes/packed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#![allow(dead_code)]
#![feature(start)]
#![feature(repr_packed)]

#[derive(Default)]
#[repr(packed)]
Expand Down

0 comments on commit 60b4ea0

Please sign in to comment.