Skip to content

Commit 255193c

Browse files
alexcrichtonalexcrichton
committed
Removing no longer needed unsafe blocks
1 parent 3136fba commit 255193c

File tree

17 files changed

+379
-483
lines changed

17 files changed

+379
-483
lines changed

‎src/libcore/char.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,10 @@ pub fn escape_unicode(c: char) -> ~str {
202202
else { ('U', 8u) });
203203
assert!(str::len(s) <= pad);
204204
let mut out = ~"\\";
205-
unsafe {
206-
str::push_str(&mut out, str::from_char(c));
207-
for uint::range(str::len(s), pad) |_i|
208-
{ str::push_str(&mut out, ~"0"); }
209-
str::push_str(&mut out, s);
210-
}
205+
str::push_str(&mut out, str::from_char(c));
206+
for uint::range(str::len(s), pad) |_i|
207+
{ str::push_str(&mut out, ~"0"); }
208+
str::push_str(&mut out, s);
211209
out
212210
}
213211

‎src/libcore/hash.rs

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -76,51 +76,43 @@ pub trait Streaming {
7676
impl<A:IterBytes> Hash for A {
7777
#[inline(always)]
7878
fn hash_keyed(&self, k0: u64, k1: u64) -> u64 {
79-
unsafe {
80-
let s = &State(k0, k1);
81-
for self.iter_bytes(true) |bytes| {
82-
s.input(bytes);
83-
}
84-
s.result_u64()
79+
let s = &State(k0, k1);
80+
for self.iter_bytes(true) |bytes| {
81+
s.input(bytes);
8582
}
83+
s.result_u64()
8684
}
8785
}
8886

8987
fn hash_keyed_2<A: IterBytes,
9088
B: IterBytes>(a: &A, b: &B, k0: u64, k1: u64) -> u64 {
91-
unsafe {
92-
let s = &State(k0, k1);
93-
for a.iter_bytes(true) |bytes| { s.input(bytes); }
94-
for b.iter_bytes(true) |bytes| { s.input(bytes); }
95-
s.result_u64()
96-
}
89+
let s = &State(k0, k1);
90+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
91+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
92+
s.result_u64()
9793
}
9894

9995
fn hash_keyed_3<A: IterBytes,
10096
B: IterBytes,
10197
C: IterBytes>(a: &A, b: &B, c: &C, k0: u64, k1: u64) -> u64 {
102-
unsafe {
103-
let s = &State(k0, k1);
104-
for a.iter_bytes(true) |bytes| { s.input(bytes); }
105-
for b.iter_bytes(true) |bytes| { s.input(bytes); }
106-
for c.iter_bytes(true) |bytes| { s.input(bytes); }
107-
s.result_u64()
108-
}
98+
let s = &State(k0, k1);
99+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
100+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
101+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
102+
s.result_u64()
109103
}
110104

111105
fn hash_keyed_4<A: IterBytes,
112106
B: IterBytes,
113107
C: IterBytes,
114108
D: IterBytes>(a: &A, b: &B, c: &C, d: &D, k0: u64, k1: u64)
115109
-> u64 {
116-
unsafe {
117-
let s = &State(k0, k1);
118-
for a.iter_bytes(true) |bytes| { s.input(bytes); }
119-
for b.iter_bytes(true) |bytes| { s.input(bytes); }
120-
for c.iter_bytes(true) |bytes| { s.input(bytes); }
121-
for d.iter_bytes(true) |bytes| { s.input(bytes); }
122-
s.result_u64()
123-
}
110+
let s = &State(k0, k1);
111+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
112+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
113+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
114+
for d.iter_bytes(true) |bytes| { s.input(bytes); }
115+
s.result_u64()
124116
}
125117

126118
fn hash_keyed_5<A: IterBytes,
@@ -129,15 +121,13 @@ fn hash_keyed_5<A: IterBytes,
129121
D: IterBytes,
130122
E: IterBytes>(a: &A, b: &B, c: &C, d: &D, e: &E,
131123
k0: u64, k1: u64) -> u64 {
132-
unsafe {
133-
let s = &State(k0, k1);
134-
for a.iter_bytes(true) |bytes| { s.input(bytes); }
135-
for b.iter_bytes(true) |bytes| { s.input(bytes); }
136-
for c.iter_bytes(true) |bytes| { s.input(bytes); }
137-
for d.iter_bytes(true) |bytes| { s.input(bytes); }
138-
for e.iter_bytes(true) |bytes| { s.input(bytes); }
139-
s.result_u64()
140-
}
124+
let s = &State(k0, k1);
125+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
126+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
127+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
128+
for d.iter_bytes(true) |bytes| { s.input(bytes); }
129+
for e.iter_bytes(true) |bytes| { s.input(bytes); }
130+
s.result_u64()
141131
}
142132

143133
// Implement State as SipState

‎src/libcore/num/strconv.rs

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,8 @@ pub fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
228228
deccum /= radix_gen;
229229
deccum = deccum.round_to_zero();
230230

231-
unsafe { // FIXME: Pureness workaround (#4568)
232-
buf.push(char::from_digit(current_digit.to_int() as uint, radix)
233-
.unwrap() as u8);
234-
}
231+
buf.push(char::from_digit(current_digit.to_int() as uint, radix)
232+
.unwrap() as u8);
235233

236234
// No more digits to calculate for the non-fractional part -> break
237235
if deccum == _0 { break; }
@@ -247,21 +245,15 @@ pub fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
247245
// Decide what sign to put in front
248246
match sign {
249247
SignNeg | SignAll if neg => {
250-
unsafe { // FIXME: Pureness workaround (#4568)
251-
buf.push('-' as u8);
252-
}
248+
buf.push('-' as u8);
253249
}
254250
SignAll => {
255-
unsafe { // FIXME: Pureness workaround (#4568)
256-
buf.push('+' as u8);
257-
}
251+
buf.push('+' as u8);
258252
}
259253
_ => ()
260254
}
261255

262-
unsafe { // FIXME: Pureness workaround (#4568)
263-
vec::reverse(buf);
264-
}
256+
vec::reverse(buf);
265257

266258
// Remember start of the fractional digits.
267259
// Points one beyond end of buf if none get generated,
@@ -271,9 +263,7 @@ pub fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
271263
// Now emit the fractional part, if any
272264
deccum = num.fractional_part();
273265
if deccum != _0 || (limit_digits && exact && digit_count > 0) {
274-
unsafe { // FIXME: Pureness workaround (#4568)
275-
buf.push('.' as u8);
276-
}
266+
buf.push('.' as u8);
277267
let mut dig = 0u;
278268

279269
// calculate new digits while
@@ -299,10 +289,8 @@ pub fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
299289
current_digit_signed
300290
};
301291

302-
unsafe { // FIXME: Pureness workaround (#4568)
303-
buf.push(char::from_digit(
304-
current_digit.to_int() as uint, radix).unwrap() as u8);
305-
}
292+
buf.push(char::from_digit(
293+
current_digit.to_int() as uint, radix).unwrap() as u8);
306294

307295
// Decrease the deccumulator one fractional digit at a time
308296
deccum = deccum.fractional_part();
@@ -320,33 +308,31 @@ pub fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
320308
char::from_digit(val, radix).unwrap() as u8
321309
};
322310

323-
unsafe { // FIXME: Pureness workaround (#4568)
324-
let extra_digit = ascii2value(buf.pop());
325-
if extra_digit >= radix / 2 { // -> need to round
326-
let mut i: int = buf.len() as int - 1;
327-
loop {
328-
// If reached left end of number, have to
329-
// insert additional digit:
330-
if i < 0
331-
|| buf[i] == '-' as u8
332-
|| buf[i] == '+' as u8 {
333-
buf.insert((i + 1) as uint, value2ascii(1));
334-
break;
335-
}
336-
337-
// Skip the '.'
338-
if buf[i] == '.' as u8 { i -= 1; loop; }
339-
340-
// Either increment the digit,
341-
// or set to 0 if max and carry the 1.
342-
let current_digit = ascii2value(buf[i]);
343-
if current_digit < (radix - 1) {
344-
buf[i] = value2ascii(current_digit+1);
345-
break;
346-
} else {
347-
buf[i] = value2ascii(0);
348-
i -= 1;
349-
}
311+
let extra_digit = ascii2value(buf.pop());
312+
if extra_digit >= radix / 2 { // -> need to round
313+
let mut i: int = buf.len() as int - 1;
314+
loop {
315+
// If reached left end of number, have to
316+
// insert additional digit:
317+
if i < 0
318+
|| buf[i] == '-' as u8
319+
|| buf[i] == '+' as u8 {
320+
buf.insert((i + 1) as uint, value2ascii(1));
321+
break;
322+
}
323+
324+
// Skip the '.'
325+
if buf[i] == '.' as u8 { i -= 1; loop; }
326+
327+
// Either increment the digit,
328+
// or set to 0 if max and carry the 1.
329+
let current_digit = ascii2value(buf[i]);
330+
if current_digit < (radix - 1) {
331+
buf[i] = value2ascii(current_digit+1);
332+
break;
333+
} else {
334+
buf[i] = value2ascii(0);
335+
i -= 1;
350336
}
351337
}
352338
}

‎src/libcore/result.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ pub enum Result<T, U> {
3939
pub fn get<T:Copy,U>(res: &Result<T, U>) -> T {
4040
match *res {
4141
Ok(copy t) => t,
42-
Err(ref the_err) => unsafe {
42+
Err(ref the_err) =>
4343
fail!(fmt!("get called on error result: %?", *the_err))
44-
}
4544
}
4645
}
4746

@@ -56,9 +55,8 @@ pub fn get<T:Copy,U>(res: &Result<T, U>) -> T {
5655
pub fn get_ref<'a, T, U>(res: &'a Result<T, U>) -> &'a T {
5756
match *res {
5857
Ok(ref t) => t,
59-
Err(ref the_err) => unsafe {
58+
Err(ref the_err) =>
6059
fail!(fmt!("get_ref called on error result: %?", *the_err))
61-
}
6260
}
6361
}
6462

‎src/libcore/str.rs

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,11 +1020,9 @@ pub fn any(ss: &str, pred: &fn(char) -> bool) -> bool {
10201020
/// Apply a function to each character
10211021
pub fn map(ss: &str, ff: &fn(char) -> char) -> ~str {
10221022
let mut result = ~"";
1023-
unsafe {
1024-
reserve(&mut result, len(ss));
1025-
for ss.each_char |cc| {
1026-
str::push_char(&mut result, ff(cc));
1027-
}
1023+
reserve(&mut result, len(ss));
1024+
for ss.each_char |cc| {
1025+
str::push_char(&mut result, ff(cc));
10281026
}
10291027
result
10301028
}
@@ -1660,20 +1658,18 @@ pub fn to_utf16(s: &str) -> ~[u16] {
16601658
// Arithmetic with u32 literals is easier on the eyes than chars.
16611659
let mut ch = ch as u32;
16621660

1663-
unsafe {
1664-
if (ch & 0xFFFF_u32) == ch {
1665-
// The BMP falls through (assuming non-surrogate, as it
1666-
// should)
1667-
assert!(ch <= 0xD7FF_u32 || ch >= 0xE000_u32);
1668-
u.push(ch as u16)
1669-
} else {
1670-
// Supplementary planes break into surrogates.
1671-
assert!(ch >= 0x1_0000_u32 && ch <= 0x10_FFFF_u32);
1672-
ch -= 0x1_0000_u32;
1673-
let w1 = 0xD800_u16 | ((ch >> 10) as u16);
1674-
let w2 = 0xDC00_u16 | ((ch as u16) & 0x3FF_u16);
1675-
u.push_all(~[w1, w2])
1676-
}
1661+
if (ch & 0xFFFF_u32) == ch {
1662+
// The BMP falls through (assuming non-surrogate, as it
1663+
// should)
1664+
assert!(ch <= 0xD7FF_u32 || ch >= 0xE000_u32);
1665+
u.push(ch as u16)
1666+
} else {
1667+
// Supplementary planes break into surrogates.
1668+
assert!(ch >= 0x1_0000_u32 && ch <= 0x10_FFFF_u32);
1669+
ch -= 0x1_0000_u32;
1670+
let w1 = 0xD800_u16 | ((ch >> 10) as u16);
1671+
let w2 = 0xDC00_u16 | ((ch as u16) & 0x3FF_u16);
1672+
u.push_all(~[w1, w2])
16771673
}
16781674
}
16791675
u
@@ -1705,16 +1701,14 @@ pub fn utf16_chars(v: &[u16], f: &fn(char)) {
17051701

17061702
pub fn from_utf16(v: &[u16]) -> ~str {
17071703
let mut buf = ~"";
1708-
unsafe {
1709-
reserve(&mut buf, vec::len(v));
1710-
utf16_chars(v, |ch| push_char(&mut buf, ch));
1711-
}
1704+
reserve(&mut buf, vec::len(v));
1705+
utf16_chars(v, |ch| push_char(&mut buf, ch));
17121706
buf
17131707
}
17141708

17151709
pub fn with_capacity(capacity: uint) -> ~str {
17161710
let mut buf = ~"";
1717-
unsafe { reserve(&mut buf, capacity); }
1711+
reserve(&mut buf, capacity);
17181712
buf
17191713
}
17201714

@@ -2105,23 +2099,19 @@ pub fn capacity(s: &const ~str) -> uint {
21052099
/// Escape each char in `s` with char::escape_default.
21062100
pub fn escape_default(s: &str) -> ~str {
21072101
let mut out: ~str = ~"";
2108-
unsafe {
2109-
reserve_at_least(&mut out, str::len(s));
2110-
for s.each_char |c| {
2111-
push_str(&mut out, char::escape_default(c));
2112-
}
2102+
reserve_at_least(&mut out, str::len(s));
2103+
for s.each_char |c| {
2104+
push_str(&mut out, char::escape_default(c));
21132105
}
21142106
out
21152107
}
21162108

21172109
/// Escape each char in `s` with char::escape_unicode.
21182110
pub fn escape_unicode(s: &str) -> ~str {
21192111
let mut out: ~str = ~"";
2120-
unsafe {
2121-
reserve_at_least(&mut out, str::len(s));
2122-
for s.each_char |c| {
2123-
push_str(&mut out, char::escape_unicode(c));
2124-
}
2112+
reserve_at_least(&mut out, str::len(s));
2113+
for s.each_char |c| {
2114+
push_str(&mut out, char::escape_unicode(c));
21252115
}
21262116
out
21272117
}

0 commit comments

Comments
 (0)