Merge branch 'resource-bits' into 'master'

move sys resource bits file to cbindgen

See merge request redox-os/relibc!1116

include/bits/sys/resource.h

@@ -1,9 +0,0 @@
-#ifndef _BITS_SYS_RESOURCE_H
-#define _BITS_SYS_RESOURCE_H
-
-#define	RUSAGE_SELF 0
-#define	RUSAGE_CHILDREN (-1)
-#define RUSAGE_BOTH (-2)
-#define	RUSAGE_THREAD 1
-
-#endif /* _BITS_SYS_RESOURCE_H */

src/header/sys_resource/cbindgen.toml

@@ -1,6 +1,11 @@
 sys_includes = ["sys/types.h", "stdint.h", "sys/time.h"]
 include_guard = "_SYS_RESOURCE_H"
-trailer = "#include <bits/sys/resource.h>"
+trailer = """
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN (-1)
+#define RUSAGE_BOTH (-2)
+#define RUSAGE_THREAD 1
+"""
 language = "C"
 style = "Tag"
 no_includes = true

src/header/sys_resource/mod.rs

@@ -12,7 +12,7 @@ use crate::{
     },
 };
 
-// Exported in bits file
+// Exported from cbindgen
 // const RUSAGE_SELF: c_int = 0;
 // const RUSAGE_CHILDREN: c_int = -1;
 // const RUSAGE_BOTH: c_int = -2;

src/platform/redox/socket.rs

@@ -15,8 +15,8 @@ use crate::{
         arpa_inet::inet_aton,
         bits_socklen_t::socklen_t,
         errno::{
-            EAFNOSUPPORT, EDOM, EFAULT, EINVAL, EMSGSIZE, ENOMEM, ENOSYS, ENOTSOCK,
-            EOPNOTSUPP, EPROTONOSUPPORT,
+            EAFNOSUPPORT, EDOM, EFAULT, EINVAL, EMSGSIZE, ENOMEM, ENOSYS, ENOTSOCK, EOPNOTSUPP,
+            EPROTONOSUPPORT,
         },
         netinet_in::{in_addr, in_port_t, sockaddr_in},
         string::strnlen,