summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Hartwig <florian.j.hartwig@gmail.com>2015-02-06 20:59:09 +0100
committerFlorian Hartwig <florian.j.hartwig@gmail.com>2015-02-06 21:23:15 +0100
commit57fe78a3cd79efae8bc9ce89e085cf65dfaae9a9 (patch)
tree4d2f1a016bb4524c6990bb146fb976675d02bd58
parent2ada333f70e1aa15d8f52e2b5a6ebb9dcd9a458a (diff)
downloadnix-57fe78a3cd79efae8bc9ce89e085cf65dfaae9a9.zip
path -> old_path
-rw-r--r--src/fcntl.rs2
-rw-r--r--src/mount.rs2
-rw-r--r--src/sys/stat.rs2
-rw-r--r--src/unistd.rs2
-rw-r--r--src/utils.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/fcntl.rs b/src/fcntl.rs
index 8e8a28a8..471a04d3 100644
--- a/src/fcntl.rs
+++ b/src/fcntl.rs
@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::old_path::Path;
use libc::{c_int, mode_t};
use errno::{SysResult, SysError};
use sys::stat::Mode;
diff --git a/src/mount.rs b/src/mount.rs
index 20302352..c2774ae2 100644
--- a/src/mount.rs
+++ b/src/mount.rs
@@ -1,5 +1,5 @@
use std::ptr;
-use std::path::Path;
+use std::old_path::Path;
use libc::{c_ulong, c_int, c_void};
use errno::{SysResult, from_ffi};
use utils::ToCStr;
diff --git a/src/sys/stat.rs b/src/sys/stat.rs
index 312b0643..ca17039c 100644
--- a/src/sys/stat.rs
+++ b/src/sys/stat.rs
@@ -3,7 +3,7 @@ pub use libc::stat as FileStat;
use std::fmt;
use std::mem;
-use std::path::Path;
+use std::old_path::Path;
use libc::mode_t;
use errno::{SysResult, SysError, from_ffi};
use fcntl::Fd;
diff --git a/src/unistd.rs b/src/unistd.rs
index 579f8de9..2a476015 100644
--- a/src/unistd.rs
+++ b/src/unistd.rs
@@ -426,7 +426,7 @@ pub fn isatty(fd: Fd) -> SysResult<bool> {
#[cfg(target_os = "linux")]
mod linux {
- use std::path::Path;
+ use std::old_path::Path;
use syscall::{syscall, SYSPIVOTROOT};
use errno::{SysResult, SysError};
use utils::ToCStr;
diff --git a/src/utils.rs b/src/utils.rs
index 332cd500..53521eae 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,5 +1,5 @@
use std::ffi::CString;
-use std::path::Path;
+use std::old_path::{Path};
pub trait ToCStr {
fn to_c_str(&self) -> CString;