---

yaml
---
r: 29823
b: refs/heads/incoming
c: 4f3aeb4
h: refs/heads/master
i:
  29821: d83624b
  29819: df749ca
  29815: f50c090
  29807: d45e389
  29791: ab7b60c
  29759: 8f32114
  29695: 1c16e97
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 2674f7902fd68ccfb28fd86b6a0690f086e4b6cb
+refs/heads/incoming: 4f3aeb4703f26d4063cd87bf2a0862051394b504
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/run.rs

@@ -120,13 +120,13 @@ fn with_envp<T>(env: &option<~[(~str,~str)]>,
 }
 
 #[cfg(windows)]
-fn with_envp<T>(env: option<~[(~str,~str)]>,
+fn with_envp<T>(env: &option<~[(~str,~str)]>,
                 cb: fn(*c_void) -> T) -> T {
     // On win32 we pass an "environment block" which is not a char**, but
     // rather a concatenation of null-terminated k=v\0 sequences, with a final
     // \0 to terminate.
     unsafe {
-        match env {
+        match *env {
           some(es) if !vec::is_empty(es) => {
             let mut blk : ~[u8] = ~[];
             for vec::each(es) |e| {