diff options
| author | bors <bors@rust-lang.org> | 2018-01-12 20:28:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-12 20:28:19 +0000 |
| commit | 51b0b3734cbd0ca58c8be3512d53fce2d95f40dd (patch) | |
| tree | 0f7929e306da4893a0db5671686f08d4443d8859 /src/libcore | |
| parent | 0b90e4e8cd068910f604f3e1fb5d03cc01f1658f (diff) | |
| parent | c12eabfb11384dfd45cab87a809aa442203dcc53 (diff) | |
| download | rust-51b0b3734cbd0ca58c8be3512d53fce2d95f40dd.tar.gz rust-51b0b3734cbd0ca58c8be3512d53fce2d95f40dd.zip | |
Auto merge of #47392 - kennytm:rollup, r=kennytm
Rollup of 24 pull requests - Successful merges: #46985, #47069, #47081, #47185, #47282, #47283, #47288, #47289, #47298, #47305, #47306, #47307, #47310, #47324, #47328, #47331, #47340, #47343, #47344, #47352, #47357, #47365, #47375, #47382 - Failed merges: #47334
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/tests/num/mod.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libcore/tests/num/mod.rs b/src/libcore/tests/num/mod.rs index 7eb5ff98857..587dcbe6d67 100644 --- a/src/libcore/tests/num/mod.rs +++ b/src/libcore/tests/num/mod.rs @@ -197,7 +197,6 @@ test_impl_from! { test_u16f64, u16, f64 } test_impl_from! { test_u32f64, u32, f64 } // Float -> Float -#[cfg_attr(all(target_arch = "wasm32", target_os = "emscripten"), ignore)] // issue 42630 #[test] fn test_f32f64() { use core::f32; |