Skip to content

Commit ab36136

Browse files
authored
Merge pull request #2455 from huajingyun01/main
Revert "fix(gix-index): handle loongarch64-musl stat struct field names"
2 parents fddf292 + afe154c commit ab36136

File tree

1 file changed

+8
-40
lines changed

1 file changed

+8
-40
lines changed

gix-index/src/fs.rs

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,14 @@ impl Metadata {
5454
pub fn modified(&self) -> Option<SystemTime> {
5555
#[cfg(not(windows))]
5656
{
57-
#[cfg(not(any(
58-
target_os = "aix",
59-
target_os = "hurd",
60-
all(target_arch = "loongarch64", target_env = "musl")
61-
)))]
57+
#[cfg(not(any(target_os = "aix", target_os = "hurd")))]
6258
let seconds = self.0.st_mtime;
63-
#[cfg(any(
64-
target_os = "aix",
65-
target_os = "hurd",
66-
all(target_arch = "loongarch64", target_env = "musl")
67-
))]
59+
#[cfg(any(target_os = "aix", target_os = "hurd"))]
6860
let seconds = self.0.st_mtim.tv_sec;
6961

70-
#[cfg(not(any(
71-
target_os = "aix",
72-
target_os = "hurd",
73-
all(target_arch = "loongarch64", target_env = "musl")
74-
)))]
62+
#[cfg(not(any(target_os = "aix", target_os = "hurd")))]
7563
let nanoseconds = self.0.st_mtime_nsec;
76-
#[cfg(any(
77-
target_os = "aix",
78-
target_os = "hurd",
79-
all(target_arch = "loongarch64", target_env = "musl")
80-
))]
64+
#[cfg(any(target_os = "aix", target_os = "hurd"))]
8165
let nanoseconds = self.0.st_mtim.tv_nsec;
8266

8367
// All operating systems treat the seconds as offset from unix epoch, hence it must
@@ -97,30 +81,14 @@ impl Metadata {
9781
pub fn created(&self) -> Option<SystemTime> {
9882
#[cfg(not(windows))]
9983
{
100-
#[cfg(not(any(
101-
target_os = "aix",
102-
target_os = "hurd",
103-
all(target_arch = "loongarch64", target_env = "musl")
104-
)))]
84+
#[cfg(not(any(target_os = "aix", target_os = "hurd")))]
10585
let seconds = self.0.st_ctime;
106-
#[cfg(any(
107-
target_os = "aix",
108-
target_os = "hurd",
109-
all(target_arch = "loongarch64", target_env = "musl")
110-
))]
86+
#[cfg(any(target_os = "aix", target_os = "hurd"))]
11187
let seconds = self.0.st_ctim.tv_sec;
11288

113-
#[cfg(not(any(
114-
target_os = "aix",
115-
target_os = "hurd",
116-
all(target_arch = "loongarch64", target_env = "musl")
117-
)))]
89+
#[cfg(not(any(target_os = "aix", target_os = "hurd")))]
11890
let nanoseconds = self.0.st_ctime_nsec;
119-
#[cfg(any(
120-
target_os = "aix",
121-
target_os = "hurd",
122-
all(target_arch = "loongarch64", target_env = "musl")
123-
))]
91+
#[cfg(any(target_os = "aix", target_os = "hurd"))]
12492
let nanoseconds = self.0.st_ctim.tv_nsec;
12593

12694
// All operating systems treat the seconds as offset from unix epoch, hence it must

0 commit comments

Comments
 (0)