Skip to content

Commit 280633a

Browse files
killerswanmarijnh
authored andcommitted
(core::str) do some replacements
1 parent 2756a61 commit 280633a

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/fuzzer/fuzzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ fn check_variants_T<T: copy>(
286286
}
287287

288288
fn last_part(filename: str) -> str {
289-
let ix = option::get(str::rindex_chars(filename, '/'));
290-
str::slice_chars(filename, ix + 1u, str::len_chars(filename) - 3u)
289+
let ix = option::get(str::rindex(filename, '/'));
290+
str::slice(filename, ix + 1u, str::len_bytes(filename) - 3u)
291291
}
292292

293293
enum happiness { passed, cleanly_rejected(str), known_bug(str), failed(str), }

src/libcore/str.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export
3636
bytes,
3737
chars,
3838
substr,
39+
slice,
3940
slice_chars,
4041
split,
4142
split_str,
@@ -72,8 +73,8 @@ export
7273
index_chars,
7374
byte_index,
7475
byte_index_from,
75-
//rindex,
76-
rindex_chars,
76+
rindex,
77+
//rindex_chars,
7778
find_chars,
7879
find_bytes,
7980
find_from_bytes,

src/libstd/fs.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ type path = str;
3434

3535
fn splitDirnameBasename (pp: path) -> {dirname: str, basename: str} {
3636
let ii;
37-
alt str::rindex_chars(pp, os_fs::path_sep) {
37+
alt str::rindex(pp, os_fs::path_sep) {
3838
option::some(xx) { ii = xx; }
3939
option::none {
40-
alt str::rindex_chars(pp, os_fs::alt_path_sep) {
40+
alt str::rindex(pp, os_fs::alt_path_sep) {
4141
option::some(xx) { ii = xx; }
4242
option::none { ret {dirname: ".", basename: pp}; }
4343
}
4444
}
4545
}
4646

47-
ret {dirname: str::slice_chars(pp, 0u, ii),
48-
basename: str::slice_chars(pp, ii + 1u, str::len_chars(pp))};
47+
ret {dirname: str::slice(pp, 0u, ii),
48+
basename: str::slice(pp, ii + 1u, str::len_bytes(pp))};
4949
}
5050

5151
/*

0 commit comments

Comments
 (0)