Merge pull request #241 from mettke/master

Updating cloudabi to 0.1
Amanieu · Jun 6, 2020 · 8852b4a · 8852b4a
2 parents d924e44 + d620881
commit 8852b4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -24,7 +24,7 @@ libc = "0.2.55"
 redox_syscall = "0.1"
 
 [target.'cfg(target_os = "cloudabi")'.dependencies]
-cloudabi = "0.0.3"
+cloudabi = "0.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winnt", "ntstatus", "minwindef",

diff --git a/core/src/thread_parker/cloudabi.rs b/core/src/thread_parker/cloudabi.rs
@@ -62,7 +62,7 @@ impl Lock {
         self.try_lock().unwrap_or_else(|| {
             // Call into the kernel to acquire a write lock.
             let subscription = abi::subscription {
-                type_: abi::eventtype::LOCK_WRLOCK,
+                r#type: abi::eventtype::LOCK_WRLOCK,
                 union: abi::subscription_union {
                     lock: abi::subscription_lock {
                         lock: self.ptr(),
@@ -136,7 +136,7 @@ impl Condvar {
     pub fn wait(&self, lock: &LockGuard) {
         unsafe {
             let subscription = abi::subscription {
-                type_: abi::eventtype::CONDVAR,
+                r#type: abi::eventtype::CONDVAR,
                 union: abi::subscription_union {
                     condvar: abi::subscription_condvar {
                         condvar: self.ptr(),
@@ -162,7 +162,7 @@ impl Condvar {
         unsafe {
             let subscriptions = [
                 abi::subscription {
-                    type_: abi::eventtype::CONDVAR,
+                    r#type: abi::eventtype::CONDVAR,
                     union: abi::subscription_union {
                         condvar: abi::subscription_condvar {
                             condvar: self.ptr(),
@@ -174,7 +174,7 @@ impl Condvar {
                     ..mem::zeroed()
                 },
                 abi::subscription {
-                    type_: abi::eventtype::CLOCK,
+                    r#type: abi::eventtype::CLOCK,
                     union: abi::subscription_union {
                         clock: abi::subscription_clock {
                             clock_id: abi::clockid::MONOTONIC,
@@ -198,7 +198,7 @@ impl Condvar {
             let events = events.assume_init();
             for i in 0..nevents {
                 debug_assert_eq!(events[i].error, abi::errno::SUCCESS);
-                if events[i].type_ == abi::eventtype::CONDVAR {
+                if events[i].r#type == abi::eventtype::CONDVAR {
                     return true;
                 }
             }