Skip to content

Commit e01d051

Browse files
committed
---
yaml --- r: 69219 b: refs/heads/auto c: 2f7d86f h: refs/heads/master i: 69217: 9a0b3bf 69215: c77a91d v: v3
1 parent 9f6716c commit e01d051

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 48f115e1681cdd5fa0d76400a3d23f7513286491
17+
refs/heads/auto: 2f7d86f9a86f0da23579eef50ba1275d36e6c0bc
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/compiletest/compiletest.rs

Lines changed: 5 additions & 5 deletions
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)

branches/auto/src/librustc/metadata/filesearch.rs

Lines changed: 1 addition & 1 deletion
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;

branches/auto/src/librustpkg/tests.rs

Lines changed: 2 additions & 2 deletions
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
}

branches/auto/src/libstd/os.rs

Lines changed: 2 additions & 2 deletions
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)