fix building errors

bpangWR · Aug 17, 2020 · ddbefe0 · ddbefe0
1 parent 8d185ca
commit ddbefe0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/library/std/src/sys/vxworks/fd.rs b/library/std/src/sys/vxworks/fd.rs
@@ -53,7 +53,7 @@ impl FileDesc {
     }
 
     #[inline]
-    fn is_read_vectored(&self) -> bool {
+    pub fn is_read_vectored(&self) -> bool {
         true
     }
 

diff --git a/library/std/src/sys/vxworks/process/process_common.rs b/library/std/src/sys/vxworks/process/process_common.rs
@@ -352,7 +352,7 @@ impl ExitStatus {
 
     fn exited(&self) -> bool {
         /*unsafe*/
-        { libc::WIFEXITED(self.0) }
+        libc::WIFEXITED(self.0)
     }
 
     pub fn success(&self) -> bool {
@@ -361,15 +361,15 @@ impl ExitStatus {
 
     pub fn code(&self) -> Option<i32> {
         if self.exited() {
-            Some(/*unsafe*/ { libc::WEXITSTATUS(self.0) })
+            Some(/*unsafe*/ libc::WEXITSTATUS(self.0))
         } else {
             None
         }
     }
 
     pub fn signal(&self) -> Option<i32> {
         if !self.exited() {
-            Some(/*unsafe*/ { libc::WTERMSIG(self.0) })
+            Some(/*unsafe*/ libc::WTERMSIG(self.0))
         } else {
             None
         }

diff --git a/library/std/src/sys/vxworks/thread_local_dtor.rs b/library/std/src/sys/vxworks/thread_local_dtor.rs
@@ -2,6 +2,6 @@
 #![unstable(feature = "thread_local_internals", issue = "none")]
 
 pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
-    use crate::sys_common::thread_local::register_dtor_fallback;
+    use crate::sys_common::thread_local_dtor::register_dtor_fallback;
     register_dtor_fallback(t, dtor);
 }