---

olsonjeffery · olsonjeffery · commit 2850ff10437e · 2013-09-17T08:40:31.000-07:00
yaml --- r: 145215 b: refs/heads/try2 c: 5d9932f h: refs/heads/master i: 145213: 59b3a13 145211: 23f153f 145207: 13428d3 145199: b1c1654 145183: beaf362 145151: 11e21e0 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3067ee6373fd956c8659cba51c69a474f8e71219
+refs/heads/try2: 5d9932fddba27572b0aeb1424b014cd21a5cf28e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/os.rs b/branches/try2/src/libstd/os.rs
@@ -196,7 +196,7 @@ pub fn env() -> ~[(~str,~str)] {
             if (ch as uint == 0) {
                 fail!("os::env() failure getting env string from OS: %s", os::last_os_error());
             }
-            result = unsafe { str::raw::from_c_multistring(ch as *libc::c_char, None) };
+            let result = unsafe { str::raw::from_c_multistring(ch as *libc::c_char, None) };
             FreeEnvironmentStringsA(ch);
             result
         }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ pub fn env() -> ~[(~str,~str)] {`
`196`	`196`	`if (ch as uint == 0) {`
`197`	`197`	`fail!("os::env() failure getting env string from OS: %s", os::last_os_error());`
`198`	`198`	`}`
`199`		`- result = unsafe { str::raw::from_c_multistring(ch as *libc::c_char, None) };`
	`199`	`+ let result = unsafe { str::raw::from_c_multistring(ch as *libc::c_char, None) };`
`200`	`200`	`FreeEnvironmentStringsA(ch);`
`201`	`201`	`result`
`202`	`202`	`}`