Skip to content

Commit 59e69aa

Browse files
committed
test: remove unnecessary unsafe blocks/functions
1 parent 8978643 commit 59e69aa

File tree

2 files changed

+33
-37
lines changed

2 files changed

+33
-37
lines changed

src/compiletest/errors.rs

+25-27
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,34 @@ pub fn load_errors(testfile: &Path) -> ~[ExpectedError] {
3030
}
3131

3232
fn parse_expected(line_num: uint, line: ~str) -> ~[ExpectedError] {
33-
unsafe {
34-
let error_tag = ~"//~";
35-
let mut idx;
36-
match str::find_str(line, error_tag) {
37-
None => return ~[],
38-
Some(nn) => { idx = (nn as uint) + str::len(error_tag); }
39-
}
33+
let error_tag = ~"//~";
34+
let mut idx;
35+
match str::find_str(line, error_tag) {
36+
None => return ~[],
37+
Some(nn) => { idx = (nn as uint) + str::len(error_tag); }
38+
}
4039

41-
// "//~^^^ kind msg" denotes a message expected
42-
// three lines above current line:
43-
let mut adjust_line = 0u;
44-
let len = str::len(line);
45-
while idx < len && line[idx] == ('^' as u8) {
46-
adjust_line += 1u;
47-
idx += 1u;
48-
}
40+
// "//~^^^ kind msg" denotes a message expected
41+
// three lines above current line:
42+
let mut adjust_line = 0u;
43+
let len = str::len(line);
44+
while idx < len && line[idx] == ('^' as u8) {
45+
adjust_line += 1u;
46+
idx += 1u;
47+
}
4948

50-
// Extract kind:
51-
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
52-
let start_kind = idx;
53-
while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
54-
let kind = str::to_lower(str::slice(line, start_kind, idx).to_owned());
49+
// Extract kind:
50+
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
51+
let start_kind = idx;
52+
while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
53+
let kind = str::to_lower(str::slice(line, start_kind, idx).to_owned());
5554

56-
// Extract msg:
57-
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
58-
let msg = str::slice(line, idx, len).to_owned();
55+
// Extract msg:
56+
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
57+
let msg = str::slice(line, idx, len).to_owned();
5958

60-
debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
59+
debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
6160

62-
return ~[ExpectedError{line: line_num - adjust_line, kind: kind,
63-
msg: msg}];
64-
}
61+
return ~[ExpectedError{line: line_num - adjust_line, kind: kind,
62+
msg: msg}];
6563
}

src/compiletest/header.rs

+8-10
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,14 @@ fn parse_name_directive(line: ~str, directive: ~str) -> bool {
171171

172172
fn parse_name_value_directive(line: ~str,
173173
directive: ~str) -> Option<~str> {
174-
unsafe {
175-
let keycolon = directive + ~":";
176-
match str::find_str(line, keycolon) {
177-
Some(colon) => {
178-
let value = str::slice(line, colon + str::len(keycolon),
179-
str::len(line)).to_owned();
180-
debug!("%s: %s", directive, value);
181-
Some(value)
182-
}
183-
None => None
174+
let keycolon = directive + ~":";
175+
match str::find_str(line, keycolon) {
176+
Some(colon) => {
177+
let value = str::slice(line, colon + str::len(keycolon),
178+
str::len(line)).to_owned();
179+
debug!("%s: %s", directive, value);
180+
Some(value)
184181
}
182+
None => None
185183
}
186184
}

0 commit comments

Comments
 (0)