Skip to content

Commit 1051518

Browse files
committed
Auto merge of rust-lang#147140 - Zalathar:rollup-rtnqek7, r=Zalathar
Rollup of 7 pull requests Successful merges: - rust-lang#133477 (Detect tuple structs that are unconstructable due to re-export) - rust-lang#146929 (compiletest: Remove old-output-capture and become a stage0 bootstrap tool) - rust-lang#146979 (constify Default on Nanoseconds) - rust-lang#147092 (Do not compute optimized MIR if code does not type-check.) - rust-lang#147112 (all 48 keywords in just 300 characters) - rust-lang#147122 (Fix some crash-test directives) - rust-lang#147127 (Add a leading dash to linker plugin arguments in the gcc codegen) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c6b2b99 + 9438bab commit 1051518

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

core/src/num/niche_types.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ impl Nanoseconds {
112112
pub const ZERO: Self = unsafe { Nanoseconds::new_unchecked(0) };
113113
}
114114

115-
impl Default for Nanoseconds {
115+
#[rustc_const_unstable(feature = "const_default", issue = "143894")]
116+
impl const Default for Nanoseconds {
116117
#[inline]
117118
fn default() -> Self {
118119
Self::ZERO

0 commit comments

Comments
 (0)