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/libstd | |
| parent | 159aebc28bdd3e7667cb269d64dee844699dc3b0 (diff) | |
| download | rust-a3f5626ad1b5bc47ceddfb0d600cf6fd8a6dad8c.tar.gz rust-a3f5626ad1b5bc47ceddfb0d600cf6fd8a6dad8c.zip | |
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/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 13 | ||||
| -rw-r--r-- | src/libstd/net.rs | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 75bde25afb8..ef0ff7e6b57 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -252,12 +252,16 @@ the first element of the returned vector will be the drive letter followed by a colon. */ fn split(p: path) -> [path] { - let split1 = str::split(p, os_fs::path_sep as u8); + // FIXME: use UTF-8 safe str, and/or various other string formats + let split1 = str::split_byte(p, os_fs::path_sep as u8); let split2 = []; for s in split1 { - split2 += str::split(s, os_fs::alt_path_sep as u8); + split2 += str::split_byte(s, os_fs::alt_path_sep as u8); } - ret split2; + + // filter out "" + let split3 = vec::filter(split2, {|seg| "" != seg}); + ret split3; } /* @@ -270,9 +274,10 @@ path includes directory components then they are included in the filename part of the result pair. */ fn splitext(p: path) -> (str, str) { + // FIXME: use UTF-8 safe str, and/or various other string formats if str::is_empty(p) { ("", "") } else { - let parts = str::split(p, '.' as u8); + let parts = str::split_byte(p, '.' as u8); if vec::len(parts) > 1u { let base = str::connect(vec::init(parts), "."); let ext = "." + option::get(vec::last(parts)); diff --git a/src/libstd/net.rs b/src/libstd/net.rs index 706221d95c2..68f8f29748a 100644 --- a/src/libstd/net.rs +++ b/src/libstd/net.rs @@ -49,7 +49,8 @@ Failure: String must be a valid IPv4 address */ fn parse_addr(ip: str) -> ip_addr { - let parts = vec::map(str::split(ip, "."[0]), {|s| uint::from_str(s) }); + let parts = vec::map(str::split_byte(ip, "."[0]), + {|s| uint::from_str(s) }); if vec::len(parts) != 4u { fail "Too many dots in IP address"; } for i in parts { if i > 255u { fail "Invalid IP Address part."; } } ipv4(parts[0] as u8, parts[1] as u8, parts[2] as u8, parts[3] as u8) |