Skip to content

Commit 2b882f3

Browse files
committed
Merge remote-tracking branch 'origin/master' into rustup
2 parents 8d7cdbb + 7433c6f commit 2b882f3

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-09-18
1+
nightly-2018-09-22

tests/run-pass/issue-53728.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#![allow(dead_code)]
2+
3+
#[repr(u16)]
4+
enum DeviceKind {
5+
Nil = 0,
6+
}
7+
#[repr(packed)]
8+
struct DeviceInfo {
9+
endianness: u8,
10+
device_kind: DeviceKind,
11+
}
12+
fn main() {
13+
let _x = None::<(DeviceInfo, u8)>;
14+
let _y = None::<(DeviceInfo, u16)>;
15+
let _z = None::<(DeviceInfo, u64)>;
16+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
use std::sync::atomic::{Ordering, AtomicUsize};
2+
13
static mut X: usize = 5;
4+
static Y: AtomicUsize = AtomicUsize::new(5);
25

36
fn main() {
47
unsafe {
58
X = 6;
69
assert_eq!(X, 6);
710
}
11+
12+
Y.store(6, Ordering::Relaxed);
13+
assert_eq!(Y.load(Ordering::Relaxed), 6);
814
}

0 commit comments

Comments
 (0)