Auto merge of #2052 - Amanieu:fix_rustc_musl, r=JohnTitor
Don't mark musl's time_t as deprecated in rustc build This allows rustc to use the latest version of the libc crate.
This commit is contained in:
commit
ab5aa27d25
|
@ -125,7 +125,8 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
|
|||
if line.len() > 80 {
|
||||
err.error(path, i, "line longer than 80 chars");
|
||||
}
|
||||
if line.contains("#[cfg(") && !line.contains(" if ")
|
||||
// This doesn't work any more due to rustfmt changes
|
||||
/*if line.contains("#[cfg(") && !line.contains(" if ")
|
||||
&& !(line.contains("target_endian") ||
|
||||
line.contains("target_arch"))
|
||||
{
|
||||
|
@ -133,11 +134,12 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
|
|||
err.error(path, i, "use cfg_if! and submodules \
|
||||
instead of #[cfg]");
|
||||
}
|
||||
}
|
||||
}*/
|
||||
if line.contains("#[derive(") && (line.contains("Copy") || line.contains("Clone")) {
|
||||
err.error(path, i, "impl ::Copy and ::Clone manually");
|
||||
}
|
||||
|
||||
let orig_line = line;
|
||||
let line = line.trim_start();
|
||||
let is_pub = line.starts_with("pub ");
|
||||
let line = if is_pub {&line[4..]} else {line};
|
||||
|
@ -161,7 +163,7 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
|
|||
} else if line.starts_with("f! {") {
|
||||
f_macros += 1;
|
||||
State::FunctionDefinitions
|
||||
} else if line.starts_with("extern ") {
|
||||
} else if line.starts_with("extern ") && !orig_line.starts_with(" ") {
|
||||
State::Functions
|
||||
} else if line.starts_with("mod ") {
|
||||
State::Modules
|
||||
|
|
16
src/psp.rs
16
src/psp.rs
|
@ -88,14 +88,12 @@ pub type SceMpegRingbufferCb = ::Option<
|
|||
>;
|
||||
|
||||
pub type GuCallback = ::Option<extern "C" fn(id: i32, arg: *mut c_void)>;
|
||||
pub type GuSwapBuffersCallback = ::Option<extern "C" fn(
|
||||
display: *mut *mut c_void, render: *mut *mut c_void
|
||||
),
|
||||
pub type GuSwapBuffersCallback = ::Option<
|
||||
extern "C" fn(display: *mut *mut c_void, render: *mut *mut c_void),
|
||||
>;
|
||||
|
||||
pub type SceNetAdhocctlHandler = ::Option<unsafe extern "C" fn(
|
||||
flag: i32, error: i32, unknown: *mut c_void
|
||||
),
|
||||
pub type SceNetAdhocctlHandler = ::Option<
|
||||
unsafe extern "C" fn(flag: i32, error: i32, unknown: *mut c_void),
|
||||
>;
|
||||
|
||||
pub type AdhocMatchingCallback = ::Option<
|
||||
|
@ -3574,10 +3572,12 @@ extern "C" {
|
|||
num_years: u64,
|
||||
) -> i32;
|
||||
pub fn sceRtcSetTime_t(date: *mut ScePspDateTime, time: u32) -> i32;
|
||||
pub fn sceRtcGetTime_t(date: *const ScePspDateTime, time: *mut u32) -> i32;
|
||||
pub fn sceRtcGetTime_t(date: *const ScePspDateTime, time: *mut u32)
|
||||
-> i32;
|
||||
pub fn sceRtcSetTime64_t(date: *mut ScePspDateTime, time: u64) -> i32;
|
||||
pub fn sceRtcGetTime64_t(
|
||||
date: *const ScePspDateTime, time: *mut u64
|
||||
date: *const ScePspDateTime,
|
||||
time: *mut u64,
|
||||
) -> i32;
|
||||
pub fn sceRtcSetDosTime(date: *mut ScePspDateTime, dos_time: u32) -> i32;
|
||||
pub fn sceRtcGetDosTime(date: *mut ScePspDateTime, dos_time: u32) -> i32;
|
||||
|
|
|
@ -634,8 +634,8 @@ extern "C" {
|
|||
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", not(target_arch = "aarch64")),
|
||||
link_name = "glob$INODE64")
|
||||
]
|
||||
link_name = "glob$INODE64"
|
||||
)]
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__glob30")]
|
||||
#[cfg_attr(
|
||||
all(target_os = "freebsd", any(freebsd11, freebsd10)),
|
||||
|
@ -869,10 +869,7 @@ extern "C" {
|
|||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "getitimer$UNIX2003"
|
||||
)]
|
||||
pub fn getitimer(
|
||||
which: ::c_int,
|
||||
curr_value: *mut ::itimerval
|
||||
) -> ::c_int;
|
||||
pub fn getitimer(which: ::c_int, curr_value: *mut ::itimerval) -> ::c_int;
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "setitimer$UNIX2003"
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
pub type pthread_t = *mut ::c_void;
|
||||
pub type clock_t = c_long;
|
||||
#[deprecated(
|
||||
#[cfg_attr(
|
||||
not(feature = "rustc-dep-of-std"),
|
||||
deprecated(
|
||||
since = "0.2.80",
|
||||
note = "This type is changed to 64-bit in musl 1.2.0, \
|
||||
we'll follow that change in the future release. \
|
||||
See #1848 for more info."
|
||||
)
|
||||
)]
|
||||
pub type time_t = c_long;
|
||||
pub type suseconds_t = c_long;
|
||||
|
|
|
@ -636,13 +636,19 @@ extern "C" {
|
|||
pub fn getchar_unlocked() -> ::c_int;
|
||||
pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
|
||||
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__socket30")]
|
||||
#[cfg_attr(target_os = "illumos", link_name = "__xnet_socket")]
|
||||
pub fn socket(domain: ::c_int, ty: ::c_int, protocol: ::c_int) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "connect$UNIX2003"
|
||||
|
@ -658,8 +664,11 @@ extern "C" {
|
|||
link_name = "listen$UNIX2003"
|
||||
)]
|
||||
pub fn listen(socket: ::c_int, backlog: ::c_int) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "accept$UNIX2003"
|
||||
|
@ -669,8 +678,11 @@ extern "C" {
|
|||
address: *mut sockaddr,
|
||||
address_len: *mut socklen_t,
|
||||
) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "getpeername$UNIX2003"
|
||||
|
@ -680,8 +692,11 @@ extern "C" {
|
|||
address: *mut sockaddr,
|
||||
address_len: *mut socklen_t,
|
||||
) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "getsockname$UNIX2003"
|
||||
|
@ -709,8 +724,11 @@ extern "C" {
|
|||
protocol: ::c_int,
|
||||
socket_vector: *mut ::c_int,
|
||||
) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "sendto$UNIX2003"
|
||||
|
@ -1286,8 +1304,11 @@ extern "C" {
|
|||
pub fn dlclose(handle: *mut ::c_void) -> ::c_int;
|
||||
pub fn dladdr(addr: *const ::c_void, info: *mut Dl_info) -> ::c_int;
|
||||
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
#[cfg_attr(target_os = "illumos", link_name = "__xnet_getaddrinfo")]
|
||||
pub fn getaddrinfo(
|
||||
node: *const c_char,
|
||||
|
@ -1295,8 +1316,11 @@ extern "C" {
|
|||
hints: *const addrinfo,
|
||||
res: *mut *mut addrinfo,
|
||||
) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
pub fn freeaddrinfo(res: *mut addrinfo);
|
||||
pub fn gai_strerror(errcode: ::c_int) -> *const ::c_char;
|
||||
#[cfg_attr(
|
||||
|
@ -1315,32 +1339,40 @@ extern "C" {
|
|||
pub fn res_init() -> ::c_int;
|
||||
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__gmtime_r50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn gmtime_r(time_p: *const time_t, result: *mut tm) -> *mut tm;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__localtime_r50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn localtime_r(time_p: *const time_t, result: *mut tm) -> *mut tm;
|
||||
#[cfg_attr(
|
||||
all(target_os = "macos", target_arch = "x86"),
|
||||
link_name = "mktime$UNIX2003"
|
||||
)]
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__mktime50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn mktime(tm: *mut tm) -> time_t;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__time50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn time(time: *mut time_t) -> time_t;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__gmtime50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn gmtime(time_p: *const time_t) -> *mut tm;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__locatime50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn localtime(time_p: *const time_t) -> *mut tm;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__difftime50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn difftime(time1: time_t, time0: time_t) -> ::c_double;
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__timegm50")]
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))] // FIXME: for `time_t`
|
||||
#[cfg_attr(target_env = "musl", allow(deprecated))]
|
||||
// FIXME: for `time_t`
|
||||
pub fn timegm(tm: *mut ::tm) -> time_t;
|
||||
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__mknod50")]
|
||||
|
@ -1537,11 +1569,7 @@ extern "C" {
|
|||
stream: *mut FILE,
|
||||
) -> ssize_t;
|
||||
|
||||
pub fn lockf(
|
||||
fd: ::c_int,
|
||||
cmd: ::c_int,
|
||||
len: ::off_t,
|
||||
) -> ::c_int;
|
||||
pub fn lockf(fd: ::c_int, cmd: ::c_int, len: ::off_t) -> ::c_int;
|
||||
}
|
||||
|
||||
cfg_if! {
|
||||
|
|
|
@ -602,8 +602,11 @@ extern "C" {
|
|||
pub fn rand() -> ::c_int;
|
||||
pub fn srand(seed: ::c_uint);
|
||||
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
pub fn bind(fd: ::c_int, addr: *const sockaddr, len: socklen_t)
|
||||
-> ::c_int;
|
||||
pub fn clock_settime(
|
||||
|
@ -620,8 +623,11 @@ extern "C" {
|
|||
) -> ::c_int;
|
||||
pub fn closesocket(sockfd: ::c_int) -> ::c_int;
|
||||
pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
pub fn recvfrom(
|
||||
fd: ::c_int,
|
||||
buf: *mut ::c_void,
|
||||
|
@ -630,8 +636,11 @@ extern "C" {
|
|||
addr: *mut sockaddr,
|
||||
addr_len: *mut socklen_t,
|
||||
) -> isize;
|
||||
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
|
||||
target_vendor = "nintendo")))]
|
||||
#[cfg(not(all(
|
||||
libc_cfg_target_vendor,
|
||||
target_arch = "powerpc",
|
||||
target_vendor = "nintendo"
|
||||
)))]
|
||||
pub fn getnameinfo(
|
||||
sa: *const sockaddr,
|
||||
salen: socklen_t,
|
||||
|
|
Loading…
Reference in New Issue