Skip to content

Commit de429a9

Browse files
committed
Remove MainResult and MainError
Since we have the [#cmd_lib::main] attr macro, we don't need them any more.
1 parent b173c55 commit de429a9

File tree

7 files changed

+5
-37
lines changed

7 files changed

+5
-37
lines changed

examples/dd_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct Opt {
3434
}
3535

3636
#[cmd_lib::main]
37-
fn main() -> MainResult {
37+
fn main() -> CmdResult {
3838
let Opt {
3939
block_size,
4040
thread_num,

examples/pipes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fn rand() -> i32 {
339339
}
340340

341341
#[cmd_lib::main]
342-
fn main() -> MainResult {
342+
fn main() -> CmdResult {
343343
// simple pre-check of TERM, tput's error message should be enough
344344
let term = std::env::var("TERM").unwrap();
345345
run_cmd!(tput -T $term sgr0 >/dev/null)?;

examples/rust_cookbook.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use cmd_lib::*;
66
use std::io::{BufRead, BufReader};
77

88
#[cmd_lib::main]
9-
fn main() -> MainResult {
9+
fn main() -> CmdResult {
1010
cmd_lib::set_pipefail(false); // do not fail due to pipe errors
1111

1212
// Run an external command and process stdout

examples/tetris.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ fn cmd_exit() {
557557
}
558558

559559
#[cmd_lib::main]
560-
fn main() -> MainResult {
560+
fn main() -> CmdResult {
561561
#[rustfmt::skip]
562562
let old_cfg = run_fun!(stty -g)?; // let's save terminal state ...
563563
tls_set!(old_stty_cfg, |cfg| *cfg = old_cfg);

macros/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use quote::quote;
88
/// # use cmd_lib::*;
99
///
1010
/// #[cmd_lib::main]
11-
/// fn main() -> MainResult {
11+
/// fn main() -> CmdResult {
1212
/// run_cmd!(bad_cmd)?;
1313
/// Ok(())
1414
/// }

src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -383,16 +383,12 @@ pub use log as inner_log;
383383
#[doc(hidden)]
384384
pub use logger::try_init_default_logger;
385385
#[doc(hidden)]
386-
pub use main_error::MainError;
387-
pub use main_error::MainResult;
388-
#[doc(hidden)]
389386
pub use process::{register_cmd, AsOsStr, Cmd, CmdString, Cmds, GroupCmds, Redirect};
390387
pub use process::{set_debug, set_pipefail, CmdEnv};
391388

392389
mod builtins;
393390
mod child;
394391
mod io;
395392
mod logger;
396-
mod main_error;
397393
mod process;
398394
mod thread_local;

src/main_error.rs

-28
This file was deleted.

0 commit comments

Comments
 (0)