From d7f97e3018ac664058a507d207676f30fda4bfe4 Mon Sep 17 00:00:00 2001
From: xales <xales@naveria.com>
Date: Tue, 28 Jan 2014 19:29:10 -0500
Subject: [PATCH] Rename std::borrow to std::reference.

Fixes #11814
---
 src/libextra/arc.rs                                  | 4 ++--
 src/libextra/sync.rs                                 | 4 ++--
 src/libstd/lib.rs                                    | 2 +-
 src/libstd/{borrow.rs => reference.rs}               | 0
 src/libstd/rt/task.rs                                | 4 ++--
 src/test/run-pass/borrowck-borrow-from-expr-block.rs | 6 +++---
 src/test/run-pass/cast-region-to-uint.rs             | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename src/libstd/{borrow.rs => reference.rs} (100%)

diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs
index bf47e3bdf89..709382358f1 100644
--- a/src/libextra/arc.rs
+++ b/src/libextra/arc.rs
@@ -47,7 +47,7 @@ use sync::{Mutex, RWLock};
 use std::cast;
 use std::sync::arc::UnsafeArc;
 use std::task;
-use std::borrow;
+use std::reference;
 
 /// As sync::condvar, a mechanism for unlock-and-descheduling and signaling.
 pub struct Condvar<'a> {
@@ -465,7 +465,7 @@ impl<T:Freeze + Send> RWArc<T> {
             // of this cast is removing the mutability.)
             let new_data = data;
             // Downgrade ensured the token belonged to us. Just a sanity check.
-            assert!(borrow::ref_eq(&(*state).data, new_data));
+            assert!(reference::ref_eq(&(*state).data, new_data));
             // Produce new token
             RWReadMode {
                 data: new_data,
diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs
index 3acaf835256..742b7831202 100644
--- a/src/libextra/sync.rs
+++ b/src/libextra/sync.rs
@@ -18,7 +18,7 @@
  */
 
 
-use std::borrow;
+use std::reference;
 use std::comm;
 use std::unstable::sync::Exclusive;
 use std::sync::arc::UnsafeArc;
@@ -634,7 +634,7 @@ impl RWLock {
     /// To be called inside of the write_downgrade block.
     pub fn downgrade<'a>(&self, token: RWLockWriteMode<'a>)
                          -> RWLockReadMode<'a> {
-        if !borrow::ref_eq(self, token.lock) {
+        if !reference::ref_eq(self, token.lock) {
             fail!("Can't downgrade() with a different rwlock's write_mode!");
         }
         unsafe {
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 17b6c24773a..ac95fbd1fb1 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -123,7 +123,7 @@ pub mod send_str;
 pub mod ptr;
 pub mod owned;
 pub mod managed;
-pub mod borrow;
+pub mod reference;
 pub mod rc;
 pub mod gc;
 
diff --git a/src/libstd/borrow.rs b/src/libstd/reference.rs
similarity index 100%
rename from src/libstd/borrow.rs
rename to src/libstd/reference.rs
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index e99e7fa4edd..09b91c138bc 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -14,7 +14,7 @@
 //! to implement this.
 
 use any::AnyOwnExt;
-use borrow;
+use reference;
 use cast;
 use cleanup;
 use clone::Clone;
@@ -287,7 +287,7 @@ impl Task {
 
 impl Drop for Task {
     fn drop(&mut self) {
-        rtdebug!("called drop for a task: {}", borrow::to_uint(self));
+        rtdebug!("called drop for a task: {}", reference::to_uint(self));
         rtassert!(self.destroyed);
     }
 }
diff --git a/src/test/run-pass/borrowck-borrow-from-expr-block.rs b/src/test/run-pass/borrowck-borrow-from-expr-block.rs
index f108d6cad6f..569acd3c7c6 100644
--- a/src/test/run-pass/borrowck-borrow-from-expr-block.rs
+++ b/src/test/run-pass/borrowck-borrow-from-expr-block.rs
@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -10,7 +10,7 @@
 
 #[feature(managed_boxes)];
 
-use std::borrow;
+use std::reference;
 use std::ptr;
 
 fn borrow(x: &int, f: |x: &int|) {
@@ -20,7 +20,7 @@ fn borrow(x: &int, f: |x: &int|) {
 fn test1(x: @~int) {
     borrow(&*(*x).clone(), |p| {
         let x_a = ptr::to_unsafe_ptr(&**x);
-        assert!((x_a as uint) != borrow::to_uint(p));
+        assert!((x_a as uint) != reference::to_uint(p));
         assert_eq!(unsafe{*x_a}, *p);
     })
 }
diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/run-pass/cast-region-to-uint.rs
index 2a3f79e8245..150e0abe2eb 100644
--- a/src/test/run-pass/cast-region-to-uint.rs
+++ b/src/test/run-pass/cast-region-to-uint.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::borrow;
+use std::reference;
 
 pub fn main() {
     let x = 3;
-    info!("&x={:x}", borrow::to_uint(&x));
+    info!("&x={:x}", reference::to_uint(&x));
 }