Skip to content

Commit f8a3553

Browse files
committed
Auto merge of #2371 - RalfJung:rustup, r=RalfJung
rustup Cc rust-lang/rust#99224
2 parents af2c50f + bd69a92 commit f8a3553

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c396bb3b8a16b1f2762b7c6078dc3e023f6a2493
1+
cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22

tests/pass/union-overwrite.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(untagged_unions)]
2-
31
#[repr(C)]
42
#[derive(Clone, Copy)]
53
struct Pair<T, U>(T, U);

tests/pass/union.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(untagged_unions)]
2-
31
fn main() {
42
a();
53
b();
@@ -22,6 +20,7 @@ fn a() {
2220
}
2321

2422
fn b() {
23+
#[derive(Copy, Clone)]
2524
struct S {
2625
x: u32,
2726
y: u32,

0 commit comments

Comments
 (0)