Skip to content

Commit 63d5f16

Browse files
authored
Merge pull request #392 from cakebaker/bump_uucore
Bump `uucore` & adapt `last` to API change
2 parents 3056067 + fee9b5f commit 63d5f16

3 files changed

Lines changed: 31 additions & 78 deletions

File tree

Cargo.lock

Lines changed: 25 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sysinfo = "0.37"
7171
tempfile = "3.9.0"
7272
textwrap = { version = "0.16.0", features = ["terminal_size"] }
7373
thiserror = "2.0"
74-
uucore = "0.1.0"
74+
uucore = "0.2.2"
7575
uuid = { version = "1.16.0", features = ["rng-rand"] }
7676
uutests = "0.2.0"
7777
windows = { version = "0.61.1" }

src/uu/last/src/platform/unix.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use uucore::error::UResult;
1111

1212
use uucore::error::USimpleError;
1313
use uucore::utmpx::time::{OffsetDateTime, UtcOffset};
14-
use uucore::utmpx::{time, Utmpx};
14+
use uucore::utmpx::{time, Utmpx, UtmpxRecord};
1515

1616
use std::fmt::Write;
1717
use std::fs;
@@ -217,7 +217,10 @@ impl Last {
217217
// For 'last' output, older output needs to be printed last (FILO), as
218218
// UtmpxIter does not implement Rev trait. A better implementation
219219
// might include implementing UtmpxIter as doubly linked
220-
Utmpx::iter_all_records_from(&self.file).for_each(|ut| ut_stack.push(ut));
220+
Utmpx::iter_all_records_from(&self.file).for_each(|ut| {
221+
let UtmpxRecord::Traditional(utmpx) = ut;
222+
ut_stack.push(*utmpx);
223+
});
221224

222225
let mut counter = 0;
223226
let mut first_ut_time = None;

0 commit comments

Comments
 (0)