RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #2835 from jfinkels/tsort-uresult

Browse source 
tsort: return UResult from uumain() function
This commit is contained in:
Sylvestre Ledru 2022-01-07 21:51:25 +01:00 • committed by GitHub
commit 480bd3c36a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/uu/tsort/src/tsort.rs
View file

@ -5,16 +5,13 @@
// *
// * For the full copyright and license information, please view the LICENSE
// * file that was distributed with this source code.
#[macro_use]
extern crate uucore;
use clap::{crate_version, App, Arg};
use std::collections::{HashMap, HashSet};
use std::fs::File;
use std::io::{stdin, BufRead, BufReader, Read};
use std::path::Path;
use uucore::display::Quotable;
use uucore::error::{FromIo, UResult, USimpleError};
use uucore::InvalidEncodingHandling;
static SUMMARY: &str = "Topological sort the strings in FILE.
@ -26,7 +23,8 @@ mod options {
pub const FILE: &str = "file";
}
pub fn uumain(args: impl uucore::Args) -> i32 {
#[uucore_procs::gen_uumain]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let args = args
.collect_str(InvalidEncodingHandling::ConvertLossy)
.accept_any();
@ -43,13 +41,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
stdin_buf = stdin();
&mut stdin_buf as &mut dyn Read
} else {
file_buf = match File::open(Path::new(&input)) {
Ok(a) => a,
_ => {
show_error!("{}: No such file or directory", input.maybe_quote());
return 1;
}
};
file_buf = File::open(Path::new(&input)).map_err_context(|| input.to_string())?;
&mut file_buf as &mut dyn Read
});
@ -69,11 +61,15 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
for ab in tokens.chunks(2) {
match ab.len() {
2 => g.add_edge(&ab[0], &ab[1]),
_ => crash!(
1,
"{}: input contains an odd number of tokens",
input.maybe_quote()
),
_ => {
return Err(USimpleError::new(
1,
format!(
"{}: input contains an odd number of tokens",
input.maybe_quote()
),
))
}
}
}
}
@ -84,14 +80,17 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
g.run_tsort();
if !g.is_acyclic() {
crash!(1, "{}, input contains a loop:", input);
return Err(USimpleError::new(
1,
format!("{}, input contains a loop:", input),
));
}
for x in &g.result {
println!("{}", x);
}
0
Ok(())
}
pub fn uu_app() -> App<'static, 'static> {