---

yaml
---
r: 57735
b: refs/heads/incoming
c: b813d68
h: refs/heads/master
i:
  57733: bee69d9
  57731: 10362df
  57727: 2e71d96
v: v3

Author: Kimundi

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 212256b1a0c8bbe1d442d98afbf891b9ea33f13f
+refs/heads/incoming: b813d68abe84e0e30c6138219a3f9f23e8f5d9de
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/num/strconv.rs

@@ -655,7 +655,6 @@ mod test {
     use option::*;
 
     #[test]
-    #[ignore(reason = "fails in x86")]
     fn from_str_ignore_underscores() {
         let s : Option<u8> = from_str_common("__1__", 2, false, false, false,
                                              ExpNone, false, true);
@@ -665,9 +664,9 @@ mod test {
                                              ExpNone, false, false);
         assert_eq!(n, None);
 
-        let f : Option<f32> = from_str_common("_1_._1_e_1_", 10, false, true, false,
+        let f : Option<f32> = from_str_common("_1_._5_e_1_", 10, false, true, false,
                                               ExpDec, false, true);
-        assert_eq!(f, Some(1.1e1f32));
+        assert_eq!(f, Some(1.5e1f32));
     }
 
     #[test]

branches/incoming/src/rt/rust_task.h

@@ -396,6 +396,12 @@ rust_task : public kernel_owned<rust_task>
     void allow_yield();
 };
 
+// FIXME (#2697): It would be really nice to be able to get rid of this.
+inline void *operator new[](size_t size, rust_task *task, const char *tag) {
+    return task->malloc(size, tag);
+}
+
+
 template <typename T> struct task_owned {
     inline void *operator new(size_t size, rust_task *task,
                                              const char *tag) {