Skip to content

Commit a0c1710

Browse files
olsonjefferybrson
authored andcommitted
---
yaml --- r: 49848 b: refs/heads/auto c: a04ba76 h: refs/heads/master v: v3
1 parent cb5cc4b commit a0c1710

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ 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: 25c3c363a82c1bd45065b4f865ef1a086e0b3907
17+
refs/heads/auto: a04ba76f8e436d1c1919b0a97bc91190c7252d7a
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/libcore/os.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,9 +1409,8 @@ mod tests {
14091409
setenv(~"USERPROFILE", ~"/home/PaloAlto");
14101410
fail_unless!(os::homedir() == Some(Path("/home/MountainView")));
14111411
1412-
option::iter(&oldhome, |s| setenv(~"HOME", *s));
1413-
option::iter(&olduserprofile,
1414-
|s| setenv(~"USERPROFILE", *s));
1412+
oldhome.each(|s| {setenv(~"HOME", *s);true});
1413+
olduserprofile.each(|s| {setenv(~"USERPROFILE", *s);true});
14151414
}
14161415
14171416
#[test]

branches/auto/src/libcore/vec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,7 @@ mod tests {
26922692

26932693
#[test]
26942694
#[should_fail]
2695+
#[ignore(cfg(windows))]
26952696
fn test_last_empty() {
26962697
let a: ~[int] = ~[];
26972698
a.last();

0 commit comments

Comments
 (0)