---

erickt · graydon · commit c4accf9fe7de · 2012-11-20T16:39:30.000-08:00
yaml --- r: 39057 b: refs/heads/incoming c: e70b481 h: refs/heads/master i: 39055: faf84e0 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 079c768df5c5ea8004b9b5b4ad9a98861416b373
+refs/heads/incoming: e70b4818032176d266be5f8030a7abb26c375228
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 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
@@ -595,7 +595,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
  * This version prepends each entry with the directory.
  */
 pub fn list_dir_path(p: &Path) -> ~[~Path] {
-    os::list_dir(p).map(|f| ~p.push(*f))
+    list_dir(p).map(|f| ~p.push(*f))
 }
 
 /// Removes a directory at the specified path

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {`
`595`	`595`	`* This version prepends each entry with the directory.`
`596`	`596`	`*/`
`597`	`597`	`pub fn list_dir_path(p: &Path) -> ~[~Path] {`
`598`		`- os::list_dir(p).map(\|f\| ~p.push(*f))`
	`598`	`+ list_dir(p).map(\|f\| ~p.push(*f))`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`/// Removes a directory at the specified path`