---

yaml
---
r: 30419
b: refs/heads/incoming
c: 6bdda1e
h: refs/heads/master
i:
  30417: 1464e6f
  30415: 222258d
v: v3

Author: olsonjeffery

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9ee7b31414fce48403daa19904a7097b9a77baea
+refs/heads/incoming: 6bdda1e0de6097c1647ac49da8b24e86dd5299b8
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task.rs

@@ -1557,7 +1557,7 @@ unsafe fn local_set<T: Owned>(
         }
         None => {
             // Find an empty slot. If not, grow the vector.
-            match (*map).position(|x| x.is_None()) {
+            match (*map).position(|x| x.is_none()) {
                 Some(empty_index) => (*map).set_elt(empty_index, new_entry),
                 None => (*map).push(new_entry)
             }
@@ -2280,7 +2280,7 @@ fn test_tls_multitask() unsafe {
     fn my_key(+_x: @~str) { }
     local_data_set(my_key, @~"parent data");
     do task::spawn unsafe {
-        assert local_data_get(my_key).is_None(); // TLS shouldn't carry over.
+        assert local_data_get(my_key).is_none(); // TLS shouldn't carry over.
         local_data_set(my_key, @~"child data");
         assert *(local_data_get(my_key).get()) == ~"child data";
         // should be cleaned up for us
@@ -2305,7 +2305,7 @@ fn test_tls_pop() unsafe {
     local_data_set(my_key, @~"weasel");
     assert *(local_data_pop(my_key).get()) == ~"weasel";
     // Pop must remove the data from the map.
-    assert local_data_pop(my_key).is_None();
+    assert local_data_pop(my_key).is_none();
 }
 
 #[test]