Skip to content

Commit d802c1f

Browse files
committed
Various cleanups and optimizations in core::str
1 parent 35e9192 commit d802c1f

File tree

7 files changed

+270
-396
lines changed

7 files changed

+270
-396
lines changed

src/comp/back/link.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
440440
none {
441441
let name =
442442
{
443-
let os = str::split_byte(
444-
fs::basename(output), '.' as u8);
443+
let os = str::split_char(fs::basename(output), '.');
445444
if (vec::len(os) < 2u) {
446445
sess.fatal(#fmt("Output file name %s doesn't\
447446
appear to have an extension", output));
@@ -576,7 +575,7 @@ fn link_binary(sess: session,
576575
} else { ret filename; }
577576
};
578577
fn rmext(filename: str) -> str {
579-
let parts = str::split_byte(filename, '.' as u8);
578+
let parts = str::split_char(filename, '.');
580579
vec::pop(parts);
581580
ret str::connect(parts, ".");
582581
}

src/comp/back/rpath.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path {
121121
abs1, abs2);
122122
let normal1 = fs::normalize(abs1);
123123
let normal2 = fs::normalize(abs2);
124-
let split1 = str::split_byte(normal1, os_fs::path_sep as u8);
125-
let split2 = str::split_byte(normal2, os_fs::path_sep as u8);
124+
let split1 = str::split_char(normal1, os_fs::path_sep);
125+
let split2 = str::split_char(normal2, os_fs::path_sep);
126126
let len1 = vec::len(split1);
127127
let len2 = vec::len(split2);
128128
assert len1 > 0u;

src/comp/metadata/cstore.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn get_used_libraries(cstore: cstore) -> [str] {
119119
}
120120

121121
fn add_used_link_args(cstore: cstore, args: str) {
122-
p(cstore).used_link_args += str::split_byte(args, ' ' as u8);
122+
p(cstore).used_link_args += str::split_char(args, ' ');
123123
}
124124

125125
fn get_used_link_args(cstore: cstore) -> [str] {

src/comp/syntax/codemap.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,16 @@ fn lookup_byte_offset(cm: codemap::codemap, chpos: uint)
176176
}
177177

178178
fn span_to_snippet(sp: span, cm: codemap::codemap) -> str {
179-
let begin = lookup_byte_offset(cm,sp.lo);
180-
let end = lookup_byte_offset(cm,sp.hi);
179+
let begin = lookup_byte_offset(cm, sp.lo);
180+
let end = lookup_byte_offset(cm, sp.hi);
181181
assert begin.fm == end.fm;
182-
ret str::slice_chars(*begin.fm.src, begin.pos, end.pos);
182+
ret str::slice(*begin.fm.src, begin.pos, end.pos);
183183
}
184184

185185
fn get_snippet(cm: codemap::codemap, fidx: uint, lo: uint, hi: uint) -> str
186186
{
187187
let fm = cm.files[fidx];
188-
ret str::slice_chars(*fm.src, lo, hi)
188+
ret str::slice(*fm.src, lo, hi)
189189
}
190190

191191
fn get_filemap(cm: codemap, filename: str) -> filemap {

0 commit comments

Comments
 (0)