diff options
| author | bors <bors@rust-lang.org> | 2016-05-09 08:48:58 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-09 08:48:58 -0700 |
| commit | af0a433865321ee9fc5287eef63227baf4cba109 (patch) | |
| tree | 9bbb98039cceade0bed4ae51f46cefa0b603abc6 /src/libsyntax | |
| parent | 0cc90978e87c6681de18c265aaa1a324c064fc3d (diff) | |
| parent | 03dd9b87cb00a3f11231c2c96f41c4c1ce6abe48 (diff) | |
| download | rust-af0a433865321ee9fc5287eef63227baf4cba109.tar.gz rust-af0a433865321ee9fc5287eef63227baf4cba109.zip | |
Auto merge of #33048 - Amanieu:integer_atomics, r=alexcrichton
Add integer atomic types Tracking issue: #32976 RFC: rust-lang/rfcs#1543 The changes to AtomicBool in the RFC are not included, they are in a separate PR (#32365).
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 7f01821b004..cf797b85f54 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -268,8 +268,11 @@ declare_features! ( // pub(restricted) visibilities (RFC 1422) (active, pub_restricted, "1.9.0", Some(32409)), - // Allow Drop types in statics/const functions (RFC 1440) - (active, drop_types_in_const, "1.9.0", Some(33156)) + // Allow Drop types in statics/const functions (RFC 1440) + (active, drop_types_in_const, "1.9.0", Some(33156)), + + // Allows cfg(target_has_atomic = "..."). + (active, cfg_target_has_atomic, "1.9.0", Some(32976)) ); declare_features! ( @@ -577,6 +580,7 @@ const GATED_CFGS: &'static [(&'static str, &'static str, fn(&Features) -> bool)] ("target_feature", "cfg_target_feature", cfg_fn!(cfg_target_feature)), ("target_vendor", "cfg_target_vendor", cfg_fn!(cfg_target_vendor)), ("target_thread_local", "cfg_target_thread_local", cfg_fn!(cfg_target_thread_local)), + ("target_has_atomic", "cfg_target_has_atomic", cfg_fn!(cfg_target_has_atomic)), ]; #[derive(Debug, Eq, PartialEq)] |