diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:34:10 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:34:10 -0800 |
| commit | 771fe9026a38cb673d0928fea1f6ebd4ba796e43 (patch) | |
| tree | eec8f16ffcd231cbdb822662a4aaca76eb10bcf0 /src/libstd/sys/common | |
| parent | 3892dd1eaa9e1c52aba0179b9d6e27a5ced0afc7 (diff) | |
| parent | 9f07d055f7823ac0e17e014f3effa2a0be0947e9 (diff) | |
| download | rust-771fe9026a38cb673d0928fea1f6ebd4ba796e43.tar.gz rust-771fe9026a38cb673d0928fea1f6ebd4ba796e43.zip | |
rollup merge of #20607: nrc/kinds
Conflicts: src/libcore/array.rs src/libcore/cell.rs src/libcore/prelude.rs src/libstd/path/posix.rs src/libstd/prelude/v1.rs src/test/compile-fail/dst-sized-trait-param.rs
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/mutex.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/mutex.rs b/src/libstd/sys/common/mutex.rs index 567c26956ef..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 kinds::Sync; +use marker::Sync; use sys::mutex as imp; /// An OS-based mutual exclusion lock. |