Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-06-02 07:20:48 +00:00
Code Issues Projects Releases Wiki Activity

metadata.as_raw() is gone in nightly

Browse Source
This commit is contained in:
Michael Neumann 2015-06-17 01:49:29 +02:00
parent b57e82e771
commit 6155252ac8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/file.rs
View File

@ -223,7 +223,7 @@ impl<'dir> File<'dir> {
/// with multiple links much more often. Thus, it should get highlighted
/// more attentively.
pub fn links(&self) -> f::Links {
let count = self.metadata.as_raw().nlink();
let count = self.metadata.nlink();
f::Links {
count: count,
@ -233,7 +233,7 @@ impl<'dir> File<'dir> {
/// This file's inode.
pub fn inode(&self) -> f::Inode {
f::Inode(self.metadata.as_raw().ino())
f::Inode(self.metadata.ino())
}
/// This file's number of filesystem blocks.
@ -241,7 +241,7 @@ impl<'dir> File<'dir> {
/// (Not the size of each block, which we don't actually report on)
pub fn blocks(&self) -> f::Blocks {
if self.is_file() || self.is_link() {
f::Blocks::Some(self.metadata.as_raw().blocks())
f::Blocks::Some(self.metadata.blocks())
}
else {
f::Blocks::None
@ -250,12 +250,12 @@ impl<'dir> File<'dir> {
/// The ID of the user that own this file.
pub fn user(&self) -> f::User {
f::User(self.metadata.as_raw().uid())
f::User(self.metadata.uid())
}
/// The ID of the group that owns this file.
pub fn group(&self) -> f::Group {
f::Group(self.metadata.as_raw().gid())
f::Group(self.metadata.gid())
}
/// This file's size, if it's a regular file.
@ -275,9 +275,9 @@ impl<'dir> File<'dir> {
/// One of this file's timestamps, as a number in seconds.
pub fn timestamp(&self, time_type: TimeType) -> f::Time {
let time_in_seconds = match time_type {
TimeType::FileAccessed => self.metadata.as_raw().atime(),
TimeType::FileModified => self.metadata.as_raw().mtime(),
TimeType::FileCreated => self.metadata.as_raw().ctime(),
TimeType::FileAccessed => self.metadata.atime(),
TimeType::FileModified => self.metadata.mtime(),
TimeType::FileCreated => self.metadata.ctime(),
};
f::Time(time_in_seconds)

8
src/options.rs
View File

@ -132,10 +132,10 @@ impl FileFilter {
SortField::Unsorted => {},
SortField::Name => files.sort_by(|a, b| natord::compare(&*a.name, &*b.name)),
SortField::Size => files.sort_by(|a, b| a.metadata.len().cmp(&b.metadata.len())),
SortField::FileInode => files.sort_by(|a, b| a.metadata.as_raw().ino().cmp(&b.metadata.as_raw().ino())),
SortField::ModifiedDate => files.sort_by(|a, b| a.metadata.as_raw().mtime().cmp(&b.metadata.as_raw().mtime())),
SortField::AccessedDate => files.sort_by(|a, b| a.metadata.as_raw().atime().cmp(&b.metadata.as_raw().atime())),
SortField::CreatedDate => files.sort_by(|a, b| a.metadata.as_raw().ctime().cmp(&b.metadata.as_raw().ctime())),
SortField::FileInode => files.sort_by(|a, b| a.metadata.ino().cmp(&b.metadata.ino())),
SortField::ModifiedDate => files.sort_by(|a, b| a.metadata.mtime().cmp(&b.metadata.mtime())),
SortField::AccessedDate => files.sort_by(|a, b| a.metadata.atime().cmp(&b.metadata.atime())),
SortField::CreatedDate => files.sort_by(|a, b| a.metadata.ctime().cmp(&b.metadata.ctime())),
SortField::Extension => files.sort_by(|a, b| match a.ext.cmp(&b.ext) {
cmp::Ordering::Equal => natord::compare(&*a.name, &*b.name),
order => order,