---

yaml
---
r: 32543
b: refs/heads/dist-snap
c: fb85124
h: refs/heads/master
i:
  32541: 163920e
  32539: 5473665
  32535: cae6bb2
  32527: 26c582b
  32511: 957a53a
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 8672b9003f17b6e38a9c55f92dfc1deef91b1344
+refs/heads/dist-snap: fb851242b7b47546ae591b75642361a494536a53
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -67,7 +67,7 @@ export option_iter;
 
 // 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;
+export private;
 
 
 // Built-in-type support modules
@@ -241,7 +241,7 @@ mod rt;
 // For internal use, not exported
 
 mod unicode;
-mod priv;
+mod private;
 mod cmath;
 mod stackwalk;
 

branches/dist-snap/src/libcore/os.rs

@@ -174,7 +174,7 @@ mod global_env {
     fn get_global_env_chan() -> comm::Chan<Msg> {
         let global_ptr = rustrt::rust_global_env_chan_ptr();
         unsafe {
-            priv::chan_from_global_ptr(global_ptr, || {
+            private::chan_from_global_ptr(global_ptr, || {
                 // FIXME (#2621): This would be a good place to use a very
                 // small foreign stack
                 task::task().sched_mode(task::SingleThreaded).unlinked()
@@ -184,7 +184,7 @@ mod global_env {
 
     fn global_env_task(msg_po: comm::Port<Msg>) {
         unsafe {
-            do priv::weaken_task |weak_po| {
+            do private::weaken_task |weak_po| {
                 loop {
                     match comm::select2(msg_po, weak_po) {
                       either::Left(MsgGetEnv(n, resp_ch)) => {

branches/dist-snap/src/libcore/priv.rs renamed to branches/dist-snap/src/libcore/private.rs

@@ -6,7 +6,7 @@ use ll = uv_ll;
 use iotask = uv_iotask;
 use get_gl = get;
 use iotask::{IoTask, spawn_iotask};
-use priv::{chan_from_global_ptr, weaken_task};
+use private::{chan_from_global_ptr, weaken_task};
 use comm = core::comm;
 use comm::{Port, Chan, select2, listen};
 use task::TaskBuilder;

branches/dist-snap/src/libstd/uv_global_loop.rs

@@ -414,7 +414,6 @@ fn restricted_keyword_table() -> HashMap<~str, ()> {
         ~"const", ~"copy",
         ~"fail", ~"fn",
         ~"impl",
-        ~"priv", ~"pub",
         ~"unsafe"
     ];
     for keys.each |word| {
@@ -435,7 +434,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
         ~"if",
         ~"let", ~"log", ~"loop",
         ~"match", ~"mod", ~"move", ~"mut",
-        ~"pure",
+        ~"priv", ~"pub", ~"pure",
         ~"ref", ~"return",
         ~"struct",
         ~"true", ~"trait", ~"type",