Skip to content

Commit 5005cc8

Browse files
committed
---
yaml --- r: 21246 b: refs/heads/snap-stage3 c: 0229bc4 h: refs/heads/master v: v3
1 parent a6d5a28 commit 5005cc8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 932f239a9c1671573b653d40f0de3a036fa4c55b
4+
refs/heads/snap-stage3: 0229bc4defdaa6bad77269204279ed1a37b3aa9f
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/core.rc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ export path;
5959
// NDM seems to be necessary for resolve to work
6060
export option_iter;
6161

62-
// FIXME (#2648): This creates some APIs that I do not want to commit
63-
// to. It is currently exported for the uv code in std, but when that
64-
// code moves into core this should become unexported
62+
// This creates some APIs that I do not want to commit to, but it must be
63+
// exported from core in order for uv to remain in std (see #2648).
6564
export priv;
6665

6766

branches/snap-stage3/src/libstd/sync.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
export condvar, semaphore, mutex, mutex_with_condvars;
1212
export rwlock, rwlock_with_condvars, rwlock_write_mode, rwlock_read_mode;
1313

14-
// FIXME (#3119) This shouldn't be a thing exported from core.
1514
import unsafe::{Exclusive, exclusive};
1615

1716
/****************************************************************************

0 commit comments

Comments
 (0)