Skip to content

Commit bbdb20a

Browse files
committed
Test fixes and merge conflicts
1 parent ba92a7b commit bbdb20a

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

src/libcore/num/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ nonzero_integers! {
101101
}
102102

103103
nonzero_integers! {
104-
// Change this to `#[unstable(feature = "i128", issue = "35118")]`
105-
// if other NonZero* integer types are stabilizied before 128-bit integers
106104
#[unstable(feature = "nonzero", issue = "49137")]
107105
NonZeroU128(u128); NonZeroI128(i128);
108106
}

src/libstd/num.rs

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ pub use core::num::{
2727
NonZeroU64, NonZeroI64, NonZeroUsize, NonZeroIsize,
2828
};
2929

30-
// Change this to `#[unstable(feature = "i128", issue = "35118")]`
31-
// if other NonZero* integer types are stabilizied before 128-bit integers
3230
#[unstable(feature = "nonzero", issue = "49137")]
3331
pub use core::num::{NonZeroU128, NonZeroI128};
3432

src/libstd/primitive_docs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ mod prim_i64 { }
751751
/// The 128-bit signed integer type.
752752
///
753753
/// *[See also the `std::i128` module](i128/index.html).*
754-
#[stable(feature = "i128", since="1.26.0")]
754+
#[stable(feature = "i128", since = "1.26.0")]
755755
mod prim_i128 { }
756756

757757
#[doc(primitive = "u8")]

src/test/run-fail/simd-intrinsic-float-minmax.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-emscripten
1212
// min-llvm-version 6.0
13+
// error-pattern: panicked
1314

1415
// Test that the simd_f{min,max} intrinsics produce the correct results.
1516

0 commit comments

Comments
 (0)