diff options
| author | Kevin Cantu <me@kevincantu.org> | 2012-02-01 20:31:01 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-02-07 16:25:35 -0800 |
| commit | a3f5626ad1b5bc47ceddfb0d600cf6fd8a6dad8c (patch) | |
| tree | 9615505c4b94fd5e84128a40b21d5917e91a75bb /src/comp | |
| parent | 159aebc28bdd3e7667cb269d64dee844699dc3b0 (diff) | |
String split renaming:
* Renamed str::split -> str::split_byte
* Renamed str::splitn -> str::splitn_byte
* Renamed str::split_func -> str::split
* Renamed str::split_char -> str::split_char
* Renamed str::split_chars_iter -> str::split_char_iter
* Added u8::is_ascii
* Fixed the behavior of str::split_str, so that it matches split_chars
and split (i.e. ["", "XXX", "YYY", ""] == split_str(".XXX.YYY.", "."))
* Fixed str::split_byte and str::splitn_byte so that they handle
splitting UTF-8 strings on a given UTF-8/ASCII byte and also handle ""
as the others do
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/back/link.rs | 5 | ||||
| -rw-r--r-- | src/comp/back/rpath.rs | 4 | ||||
| -rw-r--r-- | src/comp/metadata/cstore.rs | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index f2efb9cdc6c..68810fcd81b 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -443,7 +443,8 @@ fn build_link_meta(sess: session, c: ast::crate, output: str, none { let name = { - let os = str::split(fs::basename(output), '.' as u8); + let os = str::split_byte( + fs::basename(output), '.' as u8); if (vec::len(os) < 2u) { sess.fatal(#fmt("Output file name %s doesn't\ appear to have an extension", output)); @@ -578,7 +579,7 @@ fn link_binary(sess: session, } else { ret filename; } }; fn rmext(filename: str) -> str { - let parts = str::split(filename, '.' as u8); + let parts = str::split_byte(filename, '.' as u8); vec::pop(parts); ret str::connect(parts, "."); } diff --git a/src/comp/back/rpath.rs b/src/comp/back/rpath.rs index a2030e10fab..27eb9933275 100644 --- a/src/comp/back/rpath.rs +++ b/src/comp/back/rpath.rs @@ -128,8 +128,8 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path { abs1, abs2); let normal1 = fs::normalize(abs1); let normal2 = fs::normalize(abs2); - let split1 = str::split(normal1, os_fs::path_sep as u8); - let split2 = str::split(normal2, os_fs::path_sep as u8); + let split1 = str::split_byte(normal1, os_fs::path_sep as u8); + let split2 = str::split_byte(normal2, os_fs::path_sep as u8); let len1 = vec::len(split1); let len2 = vec::len(split2); assert len1 > 0u; diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs index 2201388897b..c6e44bfed05 100644 --- a/src/comp/metadata/cstore.rs +++ b/src/comp/metadata/cstore.rs @@ -120,7 +120,7 @@ fn get_used_libraries(cstore: cstore) -> [str] { } fn add_used_link_args(cstore: cstore, args: str) { - p(cstore).used_link_args += str::split(args, ' ' as u8); + p(cstore).used_link_args += str::split_byte(args, ' ' as u8); } fn get_used_link_args(cstore: cstore) -> [str] { |