---

graydon · graydon · commit 5952088a7412 · 2012-10-02T16:32:45.000-07:00
yaml --- r: 30962 b: refs/heads/incoming c: 8a5545e h: refs/heads/master v: v3
diff --git a/[refs] b/[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: c31a88c7f4fddb217c022ac214c0a49501d9ded3
+refs/heads/incoming: 8a5545e9cd3f9fa82e8003c2e71eee595492ad64
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/os.rs b/branches/incoming/src/libcore/os.rs
@@ -775,7 +775,8 @@ fn real_args() -> ~[~str] {
             while *ptr.offset(len) != 0 { len += 1; }
 
             // Push it onto the list.
-            vec::push(&mut args, vec::raw::form_slice(ptr, len, str::from_utf16));
+            vec::push(&mut args, vec::raw::form_slice(ptr, len,
+                                                      str::from_utf16));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,8 @@ fn real_args() -> ~[~str] {`
`775`	`775`	`while *ptr.offset(len) != 0 { len += 1; }`
`776`	`776`
`777`	`777`	`// Push it onto the list.`
`778`		`- vec::push(&mut args, vec::raw::form_slice(ptr, len, str::from_utf16));`
	`778`	`+ vec::push(&mut args, vec::raw::form_slice(ptr, len,`
	`779`	`+ str::from_utf16));`
`779`	`780`	`}`
`780`	`781`	`}`
`781`	`782`