Skip to content

Commit d122fcd

Browse files
committed
Auto merge of #148241 - matthiaskrgr:rollup-4lsapc2, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang/rust#144444 (Contract variable declarations) - rust-lang/rust#147281 (Make diagnostics clearer for binop-related errors in foreign crates) - rust-lang/rust#148131 (Skip parameter attribute deduction for MIR with `spread_arg`) - rust-lang/rust#148224 (bootstrap: `ensure(doc::Std)` no longer opens a browser) - rust-lang/rust#148226 (Bootstrap update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 09bdb28 + 4ffcb96 commit d122fcd

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)