about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-10-17 14:57:33 +0000
committerbors <bors@rust-lang.org>2017-10-17 14:57:33 +0000
commitf6d7514545cbe83e771a400d04049b96dfb210cd (patch)
tree11fbe162f7fd6a69b48549598001472f4d311045 /src/libcore
parent0be6863a15f5aacacb287ca490823ab3b7ceb302 (diff)
parent7f72b311653401226fedeb29bcae484993a14ac0 (diff)
downloadrust-f6d7514545cbe83e771a400d04049b96dfb210cd.tar.gz
rust-f6d7514545cbe83e771a400d04049b96dfb210cd.zip
Auto merge of #45344 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests

- Successful merges: #45097, #45151, #45307, #45308, #45310, #45315, #45321, #45329, #45338, #45339
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/tests/num/flt2dec/estimator.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libcore/tests/num/flt2dec/estimator.rs b/src/libcore/tests/num/flt2dec/estimator.rs
index 0bca616ea9a..857aae72c8a 100644
--- a/src/libcore/tests/num/flt2dec/estimator.rs
+++ b/src/libcore/tests/num/flt2dec/estimator.rs
@@ -8,11 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// FIXME https://github.com/kripken/emscripten/issues/4563
-// NB we have to actually not compile this test to avoid
-// an undefined symbol error
-#![cfg(not(target_os = "emscripten"))]
-
 use core::num::flt2dec::estimator::*;
 
 #[test]