b2ee996
commit b2ee996
3 files changed
+20 -141
Showing 3 changed files+20-141
▼Cargo.lock
+16-135
| @@ -69,9 +69,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" | ||
69 | 69 | |
70 | 70 | [[package]] |
71 | 71 | name = "bitflags" |
72 | -version = "2.10.0" | |
72 | +version = "2.11.0" | |
73 | 73 | source = "registry+https://github.com/rust-lang/crates.io-index" |
74 | -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" | |
74 | +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" | |
75 | 75 | |
76 | 76 | [[package]] |
77 | 77 | name = "bumpalo" |
| @@ -81,9 +81,9 @@ checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" | ||
81 | 81 | |
82 | 82 | [[package]] |
83 | 83 | name = "cc" |
84 | -version = "1.2.55" | |
84 | +version = "1.2.56" | |
85 | 85 | source = "registry+https://github.com/rust-lang/crates.io-index" |
86 | -checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" | |
86 | +checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" | |
87 | 87 | dependencies = [ |
88 | 88 | "find-msvc-tools", |
89 | 89 | "shlex", |
| @@ -181,12 +181,6 @@ dependencies = [ | ||
181 | 181 | "windows-sys 0.61.2", |
182 | 182 | ] |
183 | 183 | |
184 | -[[package]] | |
185 | -name = "equivalent" | |
186 | -version = "1.0.2" | |
187 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
188 | -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" | |
189 | - | |
190 | 184 | [[package]] |
191 | 185 | name = "errno" |
192 | 186 | version = "0.3.14" |
| @@ -214,12 +208,6 @@ dependencies = [ | ||
214 | 208 | "wasi", |
215 | 209 | ] |
216 | 210 | |
217 | -[[package]] | |
218 | -name = "hashbrown" | |
219 | -version = "0.16.1" | |
220 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
221 | -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" | |
222 | - | |
223 | 211 | [[package]] |
224 | 212 | name = "heck" |
225 | 213 | version = "0.5.0" |
| @@ -250,16 +238,6 @@ dependencies = [ | ||
250 | 238 | "cc", |
251 | 239 | ] |
252 | 240 | |
253 | -[[package]] | |
254 | -name = "indexmap" | |
255 | -version = "2.13.0" | |
256 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
257 | -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" | |
258 | -dependencies = [ | |
259 | - "equivalent", | |
260 | - "hashbrown", | |
261 | -] | |
262 | - | |
263 | 241 | [[package]] |
264 | 242 | name = "is_terminal_polyfill" |
265 | 243 | version = "1.70.2" |
| @@ -278,9 +256,9 @@ dependencies = [ | ||
278 | 256 | |
279 | 257 | [[package]] |
280 | 258 | name = "libc" |
281 | -version = "0.2.181" | |
259 | +version = "0.2.182" | |
282 | 260 | source = "registry+https://github.com/rust-lang/crates.io-index" |
283 | -checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5" | |
261 | +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" | |
284 | 262 | |
285 | 263 | [[package]] |
286 | 264 | name = "libredox" |
| @@ -312,19 +290,11 @@ dependencies = [ | ||
312 | 290 | "clap", |
313 | 291 | "dirs", |
314 | 292 | "libc", |
315 | - "serde", | |
316 | 293 | "terminal_size", |
317 | - "toml", | |
318 | 294 | "unicode-width", |
319 | - "users", | |
295 | + "uzers", | |
320 | 296 | ] |
321 | 297 | |
322 | -[[package]] | |
323 | -name = "memchr" | |
324 | -version = "2.8.0" | |
325 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
326 | -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" | |
327 | - | |
328 | 298 | [[package]] |
329 | 299 | name = "num-traits" |
330 | 300 | version = "0.2.19" |
| @@ -400,45 +370,6 @@ version = "1.0.22" | ||
400 | 370 | source = "registry+https://github.com/rust-lang/crates.io-index" |
401 | 371 | checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" |
402 | 372 | |
403 | -[[package]] | |
404 | -name = "serde" | |
405 | -version = "1.0.228" | |
406 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
407 | -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | |
408 | -dependencies = [ | |
409 | - "serde_core", | |
410 | - "serde_derive", | |
411 | -] | |
412 | - | |
413 | -[[package]] | |
414 | -name = "serde_core" | |
415 | -version = "1.0.228" | |
416 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
417 | -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | |
418 | -dependencies = [ | |
419 | - "serde_derive", | |
420 | -] | |
421 | - | |
422 | -[[package]] | |
423 | -name = "serde_derive" | |
424 | -version = "1.0.228" | |
425 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
426 | -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | |
427 | -dependencies = [ | |
428 | - "proc-macro2", | |
429 | - "quote", | |
430 | - "syn", | |
431 | -] | |
432 | - | |
433 | -[[package]] | |
434 | -name = "serde_spanned" | |
435 | -version = "0.6.9" | |
436 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
437 | -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" | |
438 | -dependencies = [ | |
439 | - "serde", | |
440 | -] | |
441 | - | |
442 | 373 | [[package]] |
443 | 374 | name = "shlex" |
444 | 375 | version = "1.3.0" |
| @@ -492,47 +423,6 @@ dependencies = [ | ||
492 | 423 | "syn", |
493 | 424 | ] |
494 | 425 | |
495 | -[[package]] | |
496 | -name = "toml" | |
497 | -version = "0.8.23" | |
498 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
499 | -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" | |
500 | -dependencies = [ | |
501 | - "serde", | |
502 | - "serde_spanned", | |
503 | - "toml_datetime", | |
504 | - "toml_edit", | |
505 | -] | |
506 | - | |
507 | -[[package]] | |
508 | -name = "toml_datetime" | |
509 | -version = "0.6.11" | |
510 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
511 | -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" | |
512 | -dependencies = [ | |
513 | - "serde", | |
514 | -] | |
515 | - | |
516 | -[[package]] | |
517 | -name = "toml_edit" | |
518 | -version = "0.22.27" | |
519 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
520 | -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" | |
521 | -dependencies = [ | |
522 | - "indexmap", | |
523 | - "serde", | |
524 | - "serde_spanned", | |
525 | - "toml_datetime", | |
526 | - "toml_write", | |
527 | - "winnow", | |
528 | -] | |
529 | - | |
530 | -[[package]] | |
531 | -name = "toml_write" | |
532 | -version = "0.1.2" | |
533 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
534 | -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" | |
535 | - | |
536 | 426 | [[package]] |
537 | 427 | name = "unicode-ident" |
538 | 428 | version = "1.0.23" |
| @@ -546,21 +436,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | ||
546 | 436 | checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" |
547 | 437 | |
548 | 438 | [[package]] |
549 | -name = "users" | |
550 | -version = "0.11.0" | |
439 | +name = "utf8parse" | |
440 | +version = "0.2.2" | |
551 | 441 | source = "registry+https://github.com/rust-lang/crates.io-index" |
552 | -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" | |
442 | +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | |
443 | + | |
444 | +[[package]] | |
445 | +name = "uzers" | |
446 | +version = "0.12.2" | |
447 | +source = "registry+https://github.com/rust-lang/crates.io-index" | |
448 | +checksum = "0b8275fb1afee25b4111d2dc8b5c505dbbc4afd0b990cb96deb2d88bff8be18d" | |
553 | 449 | dependencies = [ |
554 | 450 | "libc", |
555 | 451 | "log", |
556 | 452 | ] |
557 | 453 | |
558 | -[[package]] | |
559 | -name = "utf8parse" | |
560 | -version = "0.2.2" | |
561 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
562 | -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | |
563 | - | |
564 | 454 | [[package]] |
565 | 455 | name = "wasi" |
566 | 456 | version = "0.11.1+wasi-snapshot-preview1" |
| @@ -753,12 +643,3 @@ name = "windows_x86_64_msvc" | ||
753 | 643 | version = "0.53.1" |
754 | 644 | source = "registry+https://github.com/rust-lang/crates.io-index" |
755 | 645 | checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" |
756 | - | |
757 | -[[package]] | |
758 | -name = "winnow" | |
759 | -version = "0.7.14" | |
760 | -source = "registry+https://github.com/rust-lang/crates.io-index" | |
761 | -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" | |
762 | -dependencies = [ | |
763 | - "memchr", | |
764 | -] | |
765 | 646 | |
▼Cargo.toml
+2-4
| @@ -15,14 +15,12 @@ name = "lsf" | ||
15 | 15 | path = "src/main.rs" |
16 | 16 | |
17 | 17 | [dependencies] |
18 | -clap = { version = "4", features = ["derive"] } | |
18 | +clap = { version = "4.5", features = ["derive"] } | |
19 | 19 | terminal_size = "0.4" |
20 | 20 | chrono = "0.4" |
21 | -users = "0.11" | |
21 | +uzers = "0.12" | |
22 | 22 | libc = "0.2" |
23 | 23 | unicode-width = "0.2" |
24 | -toml = "0.8" | |
25 | -serde = { version = "1", features = ["derive"] } | |
26 | 24 | dirs = "6" |
27 | 25 | |
28 | 26 | [profile.release] |
29 | 27 | |
▼src/entry.rs
+2-2
| @@ -375,7 +375,7 @@ pub fn get_username(uid: u32, cache: &mut HashMap<u32, String>) -> String { | ||
375 | 375 | if let Some(name) = cache.get(&uid) { |
376 | 376 | return name.clone(); |
377 | 377 | } |
378 | - let name = users::get_user_by_uid(uid) | |
378 | + let name = uzers::get_user_by_uid(uid) | |
379 | 379 | .map(|u| u.name().to_string_lossy().into_owned()) |
380 | 380 | .unwrap_or_else(|| uid.to_string()); |
381 | 381 | cache.insert(uid, name.clone()); |
| @@ -387,7 +387,7 @@ pub fn get_groupname(gid: u32, cache: &mut HashMap<u32, String>) -> String { | ||
387 | 387 | if let Some(name) = cache.get(&gid) { |
388 | 388 | return name.clone(); |
389 | 389 | } |
390 | - let name = users::get_group_by_gid(gid) | |
390 | + let name = uzers::get_group_by_gid(gid) | |
391 | 391 | .map(|g| g.name().to_string_lossy().into_owned()) |
392 | 392 | .unwrap_or_else(|| gid.to_string()); |
393 | 393 | cache.insert(gid, name.clone()); |
394 | 394 | |