Skip to content

Commit c2f6fe0

Browse files
stepanchegfacebook-github-bot
authored andcommitted
--cfg=rustc_nightly
Summary: Instead of `fbcode_build`. Following diff D41061862 adds it to cargo builds too. Working on compatibility with stable. Reviewed By: ndmitchell Differential Revision: D41061861 fbshipit-source-id: f87a12335de4bf1de5edffe0ff2e591fc3dfa1c9
1 parent cf02c51 commit c2f6fe0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

starlark/src/hint.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
*/
1717

1818
// TODO(nga): also enable if cargo build and nightly.
19-
#[cfg(fbcode_build)]
19+
#[cfg(rust_nightly)]
2020
pub(crate) use std::intrinsics::likely;
21-
#[cfg(fbcode_build)]
21+
#[cfg(rust_nightly)]
2222
pub(crate) use std::intrinsics::unlikely;
2323

24-
#[cfg(not(fbcode_build))]
24+
#[cfg(not(rust_nightly))]
2525
#[inline]
2626
pub(crate) fn likely(b: bool) -> bool {
2727
b
2828
}
2929

30-
#[cfg(not(fbcode_build))]
30+
#[cfg(not(rust_nightly))]
3131
#[inline]
3232
pub(crate) fn unlikely(b: bool) -> bool {
3333
b

starlark/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
#![feature(box_syntax)]
353353
#![feature(const_mut_refs)]
354354
#![feature(const_type_id)]
355-
#![cfg_attr(fbcode_build, feature(core_intrinsics))]
355+
#![cfg_attr(rust_nightly, feature(core_intrinsics))]
356356
#![feature(generic_associated_types)]
357357
#![feature(maybe_uninit_write_slice)]
358358
#![feature(ptr_metadata)]

0 commit comments

Comments
 (0)