Re-unignore environment test on MinGW

diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs
index 545dec270fbcbb735fd194bc551384d7ecb6bf7a..a01a80c4c38b9e5bc32422f11e32402247c0f5d2 100644 (file)
--- a/src/libstd/sys/windows/os.rs
+++ b/src/libstd/sys/windows/os.rs
@@ -97,7 +97,7 @@ fn next(&mut self) -> Option<(OsString, OsString)> {
                 let pos = match s[1..].iter().position(|&u| u == b'=' as u16).map(|p| p + 1) {
                     Some(p) => p,
                     None => continue,
-                }
+                };
                 return Some((
                     OsStringExt::from_wide(&s[..pos]),
                     OsStringExt::from_wide(&s[pos+1..]),

diff --git a/src/test/run-pass/env-vars.rs b/src/test/run-pass/env-vars.rs
index d86f63c9cb91daff12bd2d29017b1c066b3d650f..933d9a728dbe7e9881c777cb89b4122f13abd757 100644 (file)
--- a/src/test/run-pass/env-vars.rs
+++ b/src/test/run-pass/env-vars.rs
@@ -14,10 +14,7 @@
 fn main() {
     for (k, v) in vars_os() {
         let v2 = var_os(&k);
-        // MingW seems to set some funky environment variables like
-        // "=C:=C:\MinGW\msys\1.0\bin" and "!::=::\" that are returned
-        // from vars() but not visible from var().
-        assert!(v2.is_none() || v2.as_ref().map(|s| &**s) == Some(&*v),
+        assert!(v2.as_ref().map(|s| &**s) == Some(&*v),
                 "bad vars->var transition: {:?} {:?} {:?}", k, v, v2);
     }
 }