From 2cdb23bbc08fba2f5dc7b0dcc79983fc02e32960 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 18 Sep 2012 11:17:40 -0700
Subject: Replace uses of 'unchecked' with 'unsafe'

---
 src/libstd/map.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/libstd/map.rs')

diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index dad1fd6f6f9..1726e1f581f 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -137,7 +137,7 @@ mod chained {
                   }
                   Some(e1) => {
                     comp += 1u;
-                    unchecked {
+                    unsafe {
                         if e1.hash == h && e1.key == *k {
                             debug!("search_tbl: present, comp %u, \
                                     hash %u, idx %u",
@@ -161,7 +161,7 @@ mod chained {
                 return NotFound;
               }
               Some(e) => {
-                unchecked {
+                unsafe {
                     if e.hash == h && e.key == *k {
                         debug!("search_tbl: present, comp %u, hash %u, \
                                 idx %u", 1u, h, idx);
@@ -265,7 +265,7 @@ mod chained {
         }
 
         pure fn find(+k: K) -> Option<V> {
-            unchecked {
+            unsafe {
                 match self.search_tbl(&k, k.hash_keyed(0,0) as uint) {
                   NotFound => None,
                   FoundFirst(_, entry) => Some(entry.value),
@@ -358,7 +358,7 @@ mod chained {
 
     impl<K:Eq IterBytes Hash Copy, V: Copy> T<K, V>: ops::Index<K, V> {
         pure fn index(&&k: K) -> V {
-            unchecked {
+            unsafe {
                 self.get(k)
             }
         }
@@ -466,7 +466,7 @@ fn hash_from_uints<V: Copy>(items: &[(uint, V)]) -> HashMap<uint, V> {
 impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     Map<K, V> {
     pure fn size() -> uint {
-        unchecked {
+        unsafe {
             do self.borrow_const |p| {
                 p.len()
             }
@@ -498,7 +498,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn find(+key: K) -> Option<V> {
-        unchecked {
+        unsafe {
             do self.borrow_const |p| {
                 p.find(&key)
             }
@@ -518,7 +518,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each(op: fn(+key: K, +value: V) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each(op)
             }
@@ -526,7 +526,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each_key(op: fn(+key: K) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each_key(op)
             }
@@ -534,7 +534,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each_value(op: fn(+value: V) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each_value(op)
             }
@@ -542,7 +542,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each_ref(op: fn(key: &K, value: &V) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each_ref(op)
             }
@@ -550,7 +550,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each_key_ref(op: fn(key: &K) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each_key_ref(op)
             }
@@ -558,7 +558,7 @@ impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     }
 
     pure fn each_value_ref(op: fn(value: &V) -> bool) {
-        unchecked {
+        unsafe {
             do self.borrow_imm |p| {
                 p.each_value_ref(op)
             }
-- 
cgit 1.4.1-3-g733a5