diff options
| author | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
| commit | e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470 (patch) | |
| tree | 3495f1e9721731384fae0e1c2a6209fd1402a76f /src/libstd/sys/redox | |
| parent | 0c6091fbd0eee290c651f73be899f221eeab3c05 (diff) | |
| parent | e17ebdf344401c265ade3b02bb68df0d0485d71a (diff) | |
| download | rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.tar.gz rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.zip | |
Auto merge of #47998 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47862, #47877, #47896, #47912, #47947, #47958, #47978, #47996, #47999, #47892 - Failed merges:
Diffstat (limited to 'src/libstd/sys/redox')
| -rw-r--r-- | src/libstd/sys/redox/thread.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/sys/redox/thread.rs b/src/libstd/sys/redox/thread.rs index c4aad8d86f8..c4719a94c7e 100644 --- a/src/libstd/sys/redox/thread.rs +++ b/src/libstd/sys/redox/thread.rs @@ -88,6 +88,7 @@ impl Thread { } pub mod guard { - pub unsafe fn current() -> Option<usize> { None } - pub unsafe fn init() -> Option<usize> { None } + pub type Guard = !; + pub unsafe fn current() -> Option<Guard> { None } + pub unsafe fn init() -> Option<Guard> { None } } |