mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove what appears to be redundant indirection from

Browse Source 
os::list_dir_path.
This commit is contained in:
Gareth Smith 2013-07-21 18:33:29 +01:00
parent c4b6216943
commit a6263694ff
4 changed files with 10 additions and 10 deletions
src
compiletest
compiletest.rs
librustc/metadata
filesearch.rs
librustpkg
tests.rs
libstd
os.rs

10
src/compiletest/compiletest.rs

@ -242,13 +242,13 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
let mut tests = ~[];
let dirs = os::list_dir_path(&config.src_base);
for dirs.iter().advance |file| {
let file = (*file).clone();
let file = file.clone();
debug!("inspecting file %s", file.to_str());
if is_test(config, file) {
let t = do make_test(config, file) {
if is_test(config, &file) {
let t = do make_test(config, &file) {
match config.mode {
mode_codegen => make_metrics_test_closure(config, file),
_ => make_test_closure(config, file)
mode_codegen => make_metrics_test_closure(config, &file),
_ => make_test_closure(config, &file)
}
};
tests.push(t)

2
src/librustc/metadata/filesearch.rs

@ -94,7 +94,7 @@ pub fn search<T>(filesearch: @FileSearch, pick: pick<T>) -> Option<T> {
let r = os::list_dir_path(lib_search_path);
for r.iter().advance |path| {
debug!("testing %s", path.to_str());
let maybe_picked = pick(*path);
let maybe_picked = pick(path);
if maybe_picked.is_some() {
debug!("picked %s", path.to_str());
rslt = maybe_picked;

4
src/librustpkg/tests.rs

@ -393,9 +393,9 @@ fn frob_source_file(workspace: &Path, pkgid: &PkgId) {
}
match maybe_p {
Some(p) => {
let w = io::file_writer(*p, &[io::Append]);
let w = io::file_writer(p, &[io::Append]);
match w {
Err(s) => { let _ = cond.raise(((**p).clone(), fmt!("Bad path: %s", s))); }
Err(s) => { let _ = cond.raise((p.clone(), fmt!("Bad path: %s", s))); }
Ok(w) => w.write_line("")
}
}

4
src/libstd/os.rs

@ -788,8 +788,8 @@ pub fn list_dir(p: &Path) -> ~[~str] {
*
* This version prepends each entry with the directory.
*/
pub fn list_dir_path(p: &Path) -> ~[~Path] {
list_dir(p).map(|f| ~p.push(*f))
pub fn list_dir_path(p: &Path) -> ~[Path] {
list_dir(p).map(|f| p.push(*f))
}
/// Removes a directory at the specified path, after removing