---

yaml
---
r: 29954
b: refs/heads/incoming
c: 0229bc4
h: refs/heads/master
v: v3

Author: bblum

[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: 932f239a9c1671573b653d40f0de3a036fa4c55b
+refs/heads/incoming: 0229bc4defdaa6bad77269204279ed1a37b3aa9f
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/core.rc

@@ -59,9 +59,8 @@ export path;
 // NDM seems to be necessary for resolve to work
 export option_iter;
 
-// FIXME (#2648): This creates some APIs that I do not want to commit
-// to. It is currently exported for the uv code in std, but when that
-// code moves into core this should become unexported
+// This creates some APIs that I do not want to commit to, but it must be
+// exported from core in order for uv to remain in std (see #2648).
 export priv;
 
 

branches/incoming/src/libstd/sync.rs

@@ -11,7 +11,6 @@
 export condvar, semaphore, mutex, mutex_with_condvars;
 export rwlock, rwlock_with_condvars, rwlock_write_mode, rwlock_read_mode;
 
-// FIXME (#3119) This shouldn't be a thing exported from core.
 import unsafe::{Exclusive, exclusive};
 
 /****************************************************************************