660bbf4f6f
Squashed 10 commits: 1) The main cause of the problem is that libstd/os/mod.rs treats emscripten targets as an alias of linux targets, whereas liblibc treats emscripten targets as musl-compliant, so it gets a slightly different struct stat64 defined. This commit adds conditional compilation checks to use the correct timestamp format on fs metadata functions in the case of compiling to emscripten targets. 2) Update previous commit to comply with rust formatting standards. Removed tab characters, remove trailing whitespaces. 3) Move emscripten changes into their own file under libstd/os/emscripten Put libstd/os/linux/fs back to the way it was. 4) Cannot use stat.st_ctim on emscripten to get created time. 5) Remove compile-time conditionals for target_env = musl, it looks like musl builds compile fine already. 6) Undone some formatting changes that are no longer needed, Removed some more target_env="musl" compilation checks that I missed from my previous commit. 7) upgrade to liblibc e19309c, it fixes the differences in the musl stat and stat64 definitions. 8) Undo the compile-time checks to check for emscripten (or musl targets) in the FileAttr struct. No longer needed after updating liblibc to e19309c. 9) Change the MetadataExt implementation of emscripten fs.rs module to match the changes in new liblibc. 10) remove a stray return statement, should have been removed in the previous commit.
80 lines
3.2 KiB
Rust
80 lines
3.2 KiB
Rust
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
//! 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")]
|
|
#![rustc_deprecated(since = "1.8.0",
|
|
reason = "these type aliases are no longer supported by \
|
|
the standard library, the `libc` crate on \
|
|
crates.io should be used instead for the correct \
|
|
definitions")]
|
|
#![allow(deprecated)]
|
|
|
|
use os::raw::{c_long, c_short, c_uint, c_ulong};
|
|
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;
|
|
|
|
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_ulong;
|
|
|
|
#[doc(inline)]
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = c_long;
|
|
|
|
#[repr(C)]
|
|
#[derive(Clone)]
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub struct stat {
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_dev: u64,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad1: c_short,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __st_ino: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mode: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_nlink: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_uid: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_gid: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_rdev: u64,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad2: c_uint,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_size: i64,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blksize: i32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blocks: i64,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime_nsec: c_long,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime_nsec: c_long,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime_nsec: c_long,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ino: u64,
|
|
}
|