diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/bitv.rs | 2 | ||||
| -rw-r--r-- | src/libstd/ebml.rs | 2 | ||||
| -rw-r--r-- | src/libstd/json.rs | 2 | ||||
| -rw-r--r-- | src/libstd/map.rs | 24 | ||||
| -rw-r--r-- | src/libstd/net_url.rs | 2 | ||||
| -rw-r--r-- | src/libstd/smallintmap.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sort.rs | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index ae696d912cd..f12ad58a813 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -127,7 +127,7 @@ impl BigBitv { let w0 = self.storage[i] & mask; let w1 = b.storage[i] & mask; let w = op(w0, w1) & mask; - if w0 != w unchecked { + if w0 != w unsafe { changed = true; self.storage[i] = w; } diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index d6b8c2f4908..0dbbfe1d150 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -43,7 +43,7 @@ type TaggedDoc = {tag: uint, doc: Doc}; impl Doc: ops::Index<uint,Doc> { pure fn index(&&tag: uint) -> Doc { - unchecked { + unsafe { get_doc(self, tag) } } diff --git a/src/libstd/json.rs b/src/libstd/json.rs index 8db0e0bfc10..b269ca84104 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -645,7 +645,7 @@ pure fn lt(value0: Json, value1: Json) -> bool { match value1 { Num(_) | String(_) | Boolean(_) | List(_) => false, Dict(d1) => { - unchecked { + unsafe { let (d0_flat, d1_flat) = { let d0_flat = dvec::DVec(); for d0.each |k, v| { d0_flat.push((k, v)); } 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) } diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index b8f11adf2e1..98907fba682 100644 --- a/src/libstd/net_url.rs +++ b/src/libstd/net_url.rs @@ -737,7 +737,7 @@ impl Url: Eq { impl Url: IterBytes { pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { - unchecked { self.to_str() }.iter_bytes(lsb0, f) + unsafe { self.to_str() }.iter_bytes(lsb0, f) } } diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs index 1cb4adac45c..ab4d46d2d8b 100644 --- a/src/libstd/smallintmap.rs +++ b/src/libstd/smallintmap.rs @@ -139,7 +139,7 @@ impl<V: Copy> SmallIntMap<V>: map::Map<uint, V> { impl<V: Copy> SmallIntMap<V>: ops::Index<uint, V> { pure fn index(&&key: uint) -> V { - unchecked { + unsafe { get(self, key) } } diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index 488ae16c751..74ee337f5b5 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -314,7 +314,7 @@ mod tests { // tjc: funny that we have to use parens pure fn ile(x: &(&static/str), y: &(&static/str)) -> bool { - unchecked // to_lower is not pure... + unsafe // to_lower is not pure... { let x = x.to_lower(); let y = y.to_lower(); |
