Skip to content

Commit 2f7d86f

Browse files
committed
auto merge of #7942 : Dretch/rust/os-listdir-path-no-squiggle, r=brson
2 parents 48f115e + a626369 commit 2f7d86f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/compiletest/compiletest.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,13 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
242242
let mut tests = ~[];
243243
let dirs = os::list_dir_path(&config.src_base);
244244
for dirs.iter().advance |file| {
245-
let file = (*file).clone();
245+
let file = file.clone();
246246
debug!("inspecting file %s", file.to_str());
247-
if is_test(config, file) {
248-
let t = do make_test(config, file) {
247+
if is_test(config, &file) {
248+
let t = do make_test(config, &file) {
249249
match config.mode {
250-
mode_codegen => make_metrics_test_closure(config, file),
251-
_ => make_test_closure(config, file)
250+
mode_codegen => make_metrics_test_closure(config, &file),
251+
_ => make_test_closure(config, &file)
252252
}
253253
};
254254
tests.push(t)

src/librustc/metadata/filesearch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub fn search<T>(filesearch: @FileSearch, pick: pick<T>) -> Option<T> {
9494
let r = os::list_dir_path(lib_search_path);
9595
for r.iter().advance |path| {
9696
debug!("testing %s", path.to_str());
97-
let maybe_picked = pick(*path);
97+
let maybe_picked = pick(path);
9898
if maybe_picked.is_some() {
9999
debug!("picked %s", path.to_str());
100100
rslt = maybe_picked;

src/librustpkg/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@ fn frob_source_file(workspace: &Path, pkgid: &PkgId) {
393393
}
394394
match maybe_p {
395395
Some(p) => {
396-
let w = io::file_writer(*p, &[io::Append]);
396+
let w = io::file_writer(p, &[io::Append]);
397397
match w {
398-
Err(s) => { let _ = cond.raise(((**p).clone(), fmt!("Bad path: %s", s))); }
398+
Err(s) => { let _ = cond.raise((p.clone(), fmt!("Bad path: %s", s))); }
399399
Ok(w) => w.write_line("")
400400
}
401401
}

src/libstd/os.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -788,8 +788,8 @@ pub fn list_dir(p: &Path) -> ~[~str] {
788788
*
789789
* This version prepends each entry with the directory.
790790
*/
791-
pub fn list_dir_path(p: &Path) -> ~[~Path] {
792-
list_dir(p).map(|f| ~p.push(*f))
791+
pub fn list_dir_path(p: &Path) -> ~[Path] {
792+
list_dir(p).map(|f| p.push(*f))
793793
}
794794

795795
/// Removes a directory at the specified path, after removing

0 commit comments

Comments
 (0)