diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 00:09:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 00:09:49 +0000 |
| commit | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (patch) | |
| tree | 9b6f6432be9c4a78fd4677f7a3125f3eb93e1a0a /src/libstd/sys/sgx/thread.rs | |
| parent | 5c9e5df3a097e094641f16dab501ab1c4da10e9f (diff) | |
| parent | 5bb9bef79577b9629b12800dcdae1d8fd52998c0 (diff) | |
| download | rust-8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e.tar.gz rust-8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e.zip | |
Auto merge of #74422 - Manishearth:rollup-7mfrf6g, r=Manishearth
Rollup of 8 pull requests Successful merges: - #73101 (Resolve items for cross-crate imports relative to the original module) - #73269 (Enable some timeouts in SGX platform) - #74033 (Add build support for Cargo's build-std feature.) - #74351 (Do not render unstable items for rustc doc) - #74357 (Some `Symbol` related improvements) - #74371 (Improve ayu rustdoc theme) - #74386 (Add RISC-V GNU/Linux to src/tools/build-manifest as a host platform) - #74398 (Clean up E0723 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys/sgx/thread.rs')
| -rw-r--r-- | src/libstd/sys/sgx/thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/sgx/thread.rs b/src/libstd/sys/sgx/thread.rs index 9b515eb82de..5895f70436e 100644 --- a/src/libstd/sys/sgx/thread.rs +++ b/src/libstd/sys/sgx/thread.rs @@ -73,8 +73,8 @@ impl Thread { // FIXME: could store this pointer in TLS somewhere } - pub fn sleep(_dur: Duration) { - rtabort!("can't sleep"); // FIXME + pub fn sleep(dur: Duration) { + usercalls::wait_timeout(0, dur, || true); } pub fn join(self) { |