---

yaml
---
r: 56379
b: refs/heads/auto
c: b813d68
h: refs/heads/master
i:
  56377: 47f488f
  56375: 8077c0f
v: v3

Author: Kimundi

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 212256b1a0c8bbe1d442d98afbf891b9ea33f13f
+refs/heads/auto: b813d68abe84e0e30c6138219a3f9f23e8f5d9de
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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/auto/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) {