From 6f48e1c9541849e444595474877c9fcad4637ba5 Mon Sep 17 00:00:00 2001 From: auronandace Date: Wed, 25 Mar 2026 13:34:03 +0000 Subject: [PATCH 1/2] move sys resource bits file to cbindgen --- include/bits/sys/resource.h | 9 --------- src/header/sys_resource/cbindgen.toml | 7 ++++++- src/header/sys_resource/mod.rs | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 include/bits/sys/resource.h diff --git a/include/bits/sys/resource.h b/include/bits/sys/resource.h deleted file mode 100644 index 3786ea331b..0000000000 --- a/include/bits/sys/resource.h +++ /dev/null @@ -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 */ diff --git a/src/header/sys_resource/cbindgen.toml b/src/header/sys_resource/cbindgen.toml index 33c1b7b4db..47674250e1 100644 --- a/src/header/sys_resource/cbindgen.toml +++ b/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 " +trailer = """ +#define RUSAGE_SELF 0 +#define RUSAGE_CHILDREN (-1) +#define RUSAGE_BOTH (-2) +#define RUSAGE_THREAD 1 +""" language = "C" style = "Tag" no_includes = true diff --git a/src/header/sys_resource/mod.rs b/src/header/sys_resource/mod.rs index 8d4d661f05..9166007a50 100644 --- a/src/header/sys_resource/mod.rs +++ b/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; From 44bb9d8d637169463166f5ef4816526b87a483c1 Mon Sep 17 00:00:00 2001 From: auronandace Date: Wed, 25 Mar 2026 13:38:12 +0000 Subject: [PATCH 2/2] cargo fmt --- src/platform/redox/socket.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/redox/socket.rs b/src/platform/redox/socket.rs index a9f1d6ac30..4ae7f2cac7 100644 --- a/src/platform/redox/socket.rs +++ b/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,