Skip to content

Commit 9728c35

Browse files
authored
Merge pull request #565 from usamoi/main
remove ctime for musl environment
2 parents 7712c07 + 8269854 commit 9728c35

5 files changed

Lines changed: 5 additions & 18 deletions

File tree

src/fs/metadata.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ pub struct JoshutoMetadata {
4949
pub directory_size: Option<usize>,
5050
pub modified: time::SystemTime,
5151
pub accessed: time::SystemTime,
52-
pub created: time::SystemTime,
5352
pub mode: Mode,
5453
pub file_type: FileType,
5554
pub link_type: LinkType,
@@ -66,13 +65,12 @@ impl JoshutoMetadata {
6665

6766
let symlink_metadata = fs::symlink_metadata(path)?;
6867
let metadata = fs::metadata(path);
69-
let (len, modified, accessed, created) = match metadata.as_ref() {
70-
Ok(m) => (m.len(), m.modified()?, m.accessed()?, m.created()?),
68+
let (len, modified, accessed) = match metadata.as_ref() {
69+
Ok(m) => (m.len(), m.modified()?, m.accessed()?),
7170
Err(_) => (
7271
symlink_metadata.len(),
7372
symlink_metadata.modified()?,
7473
symlink_metadata.accessed()?,
75-
symlink_metadata.created()?,
7674
),
7775
};
7876

@@ -125,7 +123,6 @@ impl JoshutoMetadata {
125123
directory_size,
126124
modified,
127125
accessed,
128-
created,
129126
mode,
130127
file_type,
131128
link_type,
@@ -156,10 +153,6 @@ impl JoshutoMetadata {
156153
self.accessed
157154
}
158155

159-
pub fn created(&self) -> time::SystemTime {
160-
self.created
161-
}
162-
163156
pub fn file_type(&self) -> FileType {
164157
self.file_type
165158
}

src/types/option/line_mode/args.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pub enum LineModeArgs {
33
Size,
44
ModifyTime,
55
AccessTime,
6-
BirthTime,
76
User,
87
Group,
98
Permission,
@@ -17,7 +16,6 @@ impl AsRef<str> for LineModeArgs {
1716
LineModeArgs::Size => "size",
1817
LineModeArgs::ModifyTime => "mtime",
1918
LineModeArgs::AccessTime => "atime",
20-
LineModeArgs::BirthTime => "ctime",
2119
LineModeArgs::User => "user",
2220
LineModeArgs::Group => "group",
2321
LineModeArgs::Permission => "perm",

src/types/option/line_mode/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::error::{AppError, AppErrorKind, AppResult};
88

99
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
1010
pub struct LineMode {
11-
pub mode: [LineModeArgs; 8],
11+
pub mode: [LineModeArgs; 7],
1212
pub size: usize,
1313
}
1414

@@ -19,7 +19,6 @@ impl LineMode {
1919
LineModeArgs::Size,
2020
LineModeArgs::ModifyTime,
2121
LineModeArgs::AccessTime,
22-
LineModeArgs::BirthTime,
2322
LineModeArgs::User,
2423
LineModeArgs::Group,
2524
LineModeArgs::Permission,
@@ -31,7 +30,7 @@ impl LineMode {
3130

3231
pub const fn empty() -> Self {
3332
Self {
34-
mode: [LineModeArgs::Null; 8],
33+
mode: [LineModeArgs::Null; 7],
3534
size: 0,
3635
}
3736
}
@@ -48,7 +47,7 @@ impl LineMode {
4847

4948
impl Default for LineMode {
5049
fn default() -> Self {
51-
let mut mode = [Default::default(); 8];
50+
let mut mode = [Default::default(); 7];
5251
mode[0] = LineModeArgs::Size;
5352

5453
Self { size: 1, mode }
@@ -68,7 +67,6 @@ impl LineMode {
6867
"size" => line_mode.add_mode(LineModeArgs::Size),
6968
"mtime" => line_mode.add_mode(LineModeArgs::ModifyTime),
7069
"atime" => line_mode.add_mode(LineModeArgs::AccessTime),
71-
"btime" => line_mode.add_mode(LineModeArgs::BirthTime),
7270
"user" => line_mode.add_mode(LineModeArgs::User),
7371
"group" => line_mode.add_mode(LineModeArgs::Group),
7472
"perm" => line_mode.add_mode(LineModeArgs::Permission),

src/ui/widgets/tui_dirlist_detailed.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ fn display_line_mode(mode: LineMode, entry: &JoshutoDirEntry) -> String {
143143
LineModeArgs::Size => get_entry_size_string(entry),
144144
LineModeArgs::ModifyTime => time_to_string(metadata.modified()),
145145
LineModeArgs::AccessTime => time_to_string(metadata.accessed()),
146-
LineModeArgs::BirthTime => time_to_string(metadata.created()),
147146
LineModeArgs::User => unix::uid_to_string(metadata.uid).unwrap_or("unknown".into()),
148147
LineModeArgs::Group => unix::gid_to_string(metadata.gid).unwrap_or("unknown".into()),
149148
LineModeArgs::Permission => unix::mode_to_char_array(metadata.mode, metadata.file_type)

src/utils/serde.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ where
3131
"size" => line_mode.add_mode(LineModeArgs::Size),
3232
"mtime" => line_mode.add_mode(LineModeArgs::ModifyTime),
3333
"atime" => line_mode.add_mode(LineModeArgs::AccessTime),
34-
"btime" => line_mode.add_mode(LineModeArgs::BirthTime),
3534
"user" => line_mode.add_mode(LineModeArgs::User),
3635
"group" => line_mode.add_mode(LineModeArgs::Group),
3736
"perm" => line_mode.add_mode(LineModeArgs::Permission),

0 commit comments

Comments
 (0)