diff options
| author | bors <bors@rust-lang.org> | 2020-05-18 07:53:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-18 07:53:03 +0000 |
| commit | d4bf05693c2c16e299f1adc279b54c37a8edef27 (patch) | |
| tree | d0387dbbcea22be75fdf28407eeb24c7a1688a69 /src/libstd/sys | |
| parent | 1baf85c7e09c3b5df645888a456dabefe5866b99 (diff) | |
| parent | 2cff5d961aa67693f0500d59f5d8607efaea9fdd (diff) | |
| download | rust-d4bf05693c2c16e299f1adc279b54c37a8edef27.tar.gz rust-d4bf05693c2c16e299f1adc279b54c37a8edef27.zip | |
Auto merge of #72316 - RalfJung:rollup-70g6bln, r=RalfJung
Rollup of 2 pull requests Successful merges: - #72143 (make offset must_use) - #72307 (use the new interface to initialize conditional variables) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/hermit/condvar.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/sys/hermit/condvar.rs b/src/libstd/sys/hermit/condvar.rs index 5b7f16ce562..94e3275448a 100644 --- a/src/libstd/sys/hermit/condvar.rs +++ b/src/libstd/sys/hermit/condvar.rs @@ -12,9 +12,8 @@ impl Condvar { Condvar { identifier: 0 } } - #[inline] pub unsafe fn init(&mut self) { - // nothing to do + let _ = abi::init_queue(self.id()); } pub unsafe fn notify_one(&self) { @@ -50,7 +49,6 @@ impl Condvar { ret } - #[inline] pub unsafe fn destroy(&self) { let _ = abi::destroy_queue(self.id()); } |
