Skip to content

Commit 3378061

Browse files
author
The Miri Cronjob Bot
committed
Merge ref '292be5c7c051' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 292be5c7c05138d753bbd4b30db7a3f1a5c914f7 Filtered ref: b038f59 Upstream diff: rust-lang/rust@27050c0...292be5c This merge was created using https://github.com/rust-lang/josh-sync.
2 parents 7a688dc + b038f59 commit 3378061

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#![feature(derive_coerce_pointee)]
1818
#![feature(arbitrary_self_types)]
1919
#![feature(iter_advance_by)]
20-
#![cfg_attr(not(bootstrap), feature(duration_from_nanos_u128))]
20+
#![feature(duration_from_nanos_u128)]
2121
// Configure clippy and other lints
2222
#![allow(
2323
clippy::collapsible_else_if,

0 commit comments

Comments
 (0)