---

yaml
---
r: 178722
b: refs/heads/master
c: 45ddf50
h: refs/heads/master
v: v3

Author: aturon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3e39f0bc0e96f76610104918edaa5912f4f352df
+refs/heads/master: 45ddf50cebd8f3353383e473327911c1f8b34cd6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/libstd/ffi/mod.rs

@@ -24,6 +24,7 @@ pub use self::os_str::OsStr;
 mod c_str;
 mod os_str;
 
+// FIXME (#21670): these should be defined in the os_str module
 /// Freely convertible to an `&OsStr` slice.
 pub trait AsOsStr {
     /// Convert to an `&OsStr` slice.

trunk/src/libstd/ffi/os_str.rs

@@ -41,7 +41,7 @@ use string::{String, CowString};
 use ops;
 use cmp;
 use hash::{Hash, Hasher, Writer};
-use path::{Path, GenericPath};
+use old_path::{Path, GenericPath};
 
 use sys::os_str::{Buf, Slice};
 use sys_common::{AsInner, IntoInner, FromInner};