diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 11:33:42 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 12:10:31 +1300 |
| commit | 9f07d055f7823ac0e17e014f3effa2a0be0947e9 (patch) | |
| tree | b4a0f390cd26323522cbcfaf7ba2464fc5f13bb2 /src/libstd/sys | |
| parent | 91ba66fa99830d4963d6adb47439b86253bf5a4c (diff) | |
| download | rust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.tar.gz rust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.zip | |
markers -> marker
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/mutex.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/c.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sys/unix/mutex.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/sys/common/mutex.rs b/src/libstd/sys/common/mutex.rs index b86e6ce254a..9aea0fb3b31 100644 --- a/src/libstd/sys/common/mutex.rs +++ b/src/libstd/sys/common/mutex.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use markers::Sync; +use marker::Sync; use sys::mutex as imp; /// An OS-based mutual exclusion lock. diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs index 968347bbfbc..cc661877bc0 100644 --- a/src/libstd/sys/unix/c.rs +++ b/src/libstd/sys/unix/c.rs @@ -165,8 +165,8 @@ mod signal { sa_restorer: *mut libc::c_void, } - unsafe impl ::markers::Send for sigaction { } - unsafe impl ::markers::Sync for sigaction { } + unsafe impl ::marker::Send for sigaction { } + unsafe impl ::marker::Sync for sigaction { } #[repr(C)] #[cfg(target_word_size = "32")] @@ -217,8 +217,8 @@ mod signal { sa_resv: [libc::c_int; 1], } - unsafe impl ::markers::Send for sigaction { } - unsafe impl ::markers::Sync for sigaction { } + unsafe impl ::marker::Send for sigaction { } + unsafe impl ::marker::Sync for sigaction { } #[repr(C)] pub struct sigset_t { diff --git a/src/libstd/sys/unix/mutex.rs b/src/libstd/sys/unix/mutex.rs index 8da25c7880d..ada8a7f2349 100644 --- a/src/libstd/sys/unix/mutex.rs +++ b/src/libstd/sys/unix/mutex.rs @@ -9,7 +9,7 @@ // except according to those terms. use cell::UnsafeCell; -use markers::Sync; +use marker::Sync; use sys::sync as ffi; use sys_common::mutex; |