bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #134080 - kleisauke:avoid-lfs64-emscripten, r=Noratrieb

Browse source 
Avoid use of LFS64 symbols on Emscripten

Since Emscripten uses musl libc internally.

Non-functional change: all LFS64 symbols were aliased to their non-LFS64 counterparts in rust-lang/libc@7c952dceaa.
This commit is contained in:
bors 2025-01-01 18:55:10 +00:00
commit 45d11e51bb
4 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/os/emscripten/fs.rs
View file

@ -63,7 +63,7 @@ pub trait MetadataExt {
impl MetadataExt for Metadata {
#[allow(deprecated)]
fn as_raw_stat(&self) -> &raw::stat {
unsafe { &*(self.as_inner().as_inner() as *const libc::stat64 as *const raw::stat) }
unsafe { &*(self.as_inner().as_inner() as *const libc::stat as *const raw::stat) }
}
fn st_dev(&self) -> u64 {
self.as_inner().as_inner().st_dev as u64

2
library/std/src/os/emscripten/raw.rs
View file

@ -1,6 +1,4 @@
//! Emscripten-specific raw type definitions
//! This is basically exactly the same as the linux definitions,
//! except using the musl-specific stat64 structure in liblibc.
#![stable(feature = "raw_ext", since = "1.1.0")]
#![deprecated(

2
library/std/src/sys/pal/unix/fd.rs
View file

@ -5,7 +5,6 @@ mod tests;
#[cfg(not(any(
target_os = "linux",
target_os = "emscripten",
target_os = "l4re",
target_os = "android",
target_os = "hurd",
@ -14,7 +13,6 @@ use libc::off_t as off64_t;
#[cfg(any(
target_os = "android",
target_os = "linux",
target_os = "emscripten",
target_os = "l4re",
target_os = "hurd",
))]

14
library/std/src/sys/pal/unix/fs.rs
View file

@ -8,16 +8,11 @@ mod tests;
use libc::c_char;
#[cfg(any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "android",
target_os = "hurd"
))]
use libc::dirfd;
#[cfg(any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "hurd"
))]
#[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "hurd"))]
use libc::fstatat64;
#[cfg(any(
target_os = "android",
@ -34,7 +29,6 @@ use libc::readdir as readdir64;
#[cfg(not(any(
target_os = "android",
target_os = "linux",
target_os = "emscripten",
target_os = "solaris",
target_os = "illumos",
target_os = "l4re",
@ -48,7 +42,7 @@ use libc::readdir as readdir64;
use libc::readdir_r as readdir64_r;
#[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "hurd"))]
use libc::readdir64;
#[cfg(any(target_os = "emscripten", target_os = "l4re"))]
#[cfg(target_os = "l4re")]
use libc::readdir64_r;
use libc::{c_int, mode_t};
#[cfg(target_os = "android")]
@ -58,7 +52,6 @@ use libc::{
};
#[cfg(not(any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "l4re",
target_os = "android",
target_os = "hurd",
@ -69,7 +62,6 @@ use libc::{
};
#[cfg(any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "l4re",
target_os = "hurd"
))]
@ -899,7 +891,6 @@ impl DirEntry {
#[cfg(all(
any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "android",
target_os = "hurd"
),
@ -928,7 +919,6 @@ impl DirEntry {
#[cfg(any(
not(any(
all(target_os = "linux", not(target_env = "musl")),
target_os = "emscripten",
target_os = "android",
target_os = "hurd",
)),