1 files changed, 10 insertions, 10 deletions
diff --git a/src/libcore/util.rs b/src/libcore/util.rs
index 8c38949f5df..aa1fe14ba88 100644
--- a/src/libcore/util.rs
+++ b/src/libcore/util.rs
@@ -5,25 +5,25 @@ Miscellaneous helpers for common patterns.
 */
 
 // NB: transitionary, de-mode-ing.
-#[forbid(deprecated_mode)];
+// tjc: re-forbid deprecated modes after snapshot
 #[forbid(deprecated_pattern)];
 
 use cmp::Eq;
 
 /// The identity function.
 #[inline(always)]
-pure fn id<T>(+x: T) -> T { move x }
+pub pure fn id<T>(x: T) -> T { move x }
 
 /// Ignores a value.
 #[inline(always)]
-pure fn ignore<T>(+_x: T) { }
+pub pure fn ignore<T>(_x: T) { }
 
 /// Sets `*ptr` to `new_value`, invokes `op()`, and then restores the
 /// original value of `*ptr`.
 #[inline(always)]
-fn with<T: Copy, R>(
+pub fn with<T: Copy, R>(
     ptr: &mut T,
-    +new_value: T,
+    new_value: T,
     op: &fn() -> R) -> R
 {
     // NDM: if swap operator were defined somewhat differently,
@@ -41,7 +41,7 @@ fn with<T: Copy, R>(
  * deinitialising or copying either one.
  */
 #[inline(always)]
-fn swap<T>(x: &mut T, y: &mut T) {
+pub fn swap<T>(x: &mut T, y: &mut T) {
     *x <-> *y;
 }
 
@@ -50,19 +50,19 @@ fn swap<T>(x: &mut T, y: &mut T) {
  * value, without deinitialising or copying either one.
  */
 #[inline(always)]
-fn replace<T>(dest: &mut T, +src: T) -> T {
+pub fn replace<T>(dest: &mut T, src: T) -> T {
     let mut tmp <- src;
     swap(dest, &mut tmp);
     move tmp
 }
 
 /// A non-copyable dummy type.
-struct NonCopyable {
+pub struct NonCopyable {
     i: (),
     drop { }
 }
 
-fn NonCopyable() -> NonCopyable { NonCopyable { i: () } }
+pub fn NonCopyable() -> NonCopyable { NonCopyable { i: () } }
 
 /**
 A utility function for indicating unreachable code. It will fail if
@@ -88,7 +88,7 @@ fn choose_weighted_item(v: &[Item]) -> Item {
 ~~~
 
 */
-fn unreachable() -> ! {
+pub fn unreachable() -> ! {
     fail ~"internal error: entered unreachable code";
 }