OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std: DeCamelCase fs::splitDirnameBasename

This commit is contained in:
Brian Anderson 2012-02-29 22:51:29 -08:00
parent 9208684e74
commit 1471b1f3ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/fs.rs
View File

@ -32,7 +32,7 @@ A path or fragment of a filesystem path
*/ */
type path = str; type path = str;
fn splitDirnameBasename (pp: path) -> {dirname: str, basename: str} { fn split_dirname_basename (pp: path) -> {dirname: str, basename: str} {
alt str::rfind(pp, {|ch| alt str::rfind(pp, {|ch|
ch == os_fs::path_sep || ch == os_fs::alt_path_sep ch == os_fs::path_sep || ch == os_fs::alt_path_sep
}) { }) {
@ -56,7 +56,7 @@ The dirname of "/usr/share" will be "/usr", but the dirname of
If the path is not prefixed with a directory, then "." is returned. If the path is not prefixed with a directory, then "." is returned.
*/ */
fn dirname(pp: path) -> path { fn dirname(pp: path) -> path {
ret splitDirnameBasename(pp).dirname; ret split_dirname_basename(pp).dirname;
} }
/* /*
@ -71,7 +71,7 @@ the provided path. If an empty path is provided or the path ends
with a path separator then an empty path is returned. with a path separator then an empty path is returned.
*/ */
fn basename(pp: path) -> path { fn basename(pp: path) -> path {
ret splitDirnameBasename(pp).basename; ret split_dirname_basename(pp).basename;
} }
// FIXME: Need some typestate to avoid bounds check when len(pre) == 0 // FIXME: Need some typestate to avoid bounds check when len(pre) == 0