laumann/pijul - Change SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC

use native external subcommand support instead of hand-rolled one

Created by danieleades on November 30, 2020

SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/main.rs at line 6 [5.83981]
[4.577]
[5.84279]
```
use std::ffi::OsString;
```

Insertion in pijul/src/main.rs at line 107 [5.83981]

[5.85867]


    #[clap(external_subcommand)]
    ExternalSubcommand(Vec<OsString>),

Replacement in pijul/src/main.rs at line 183 [5.83981]

B:BD[5.88177] → [6.0:519]

∅:D[6.519] → [7.190:200]

B:BD[7.190] → [7.190:200]

∅:D[7.419] → [5.88349:88355]

B:BD[5.88349] → [5.88349:88355]

B:BD[5.88355] → [8.0:27]

B:BD[8.27] → [7.420:422]

    match external_command() {
        Ok(false) => {
            let opts = Opts::parse();
            if let Err(e) = run(opts).await {
                writeln!(std::io::stderr(), "Error: {}", e).unwrap_or(());
                std::process::exit(1);
            }
        }
        Ok(true) => (),
        Err((cmd, e)) => {
            writeln!(
                std::io::stderr(),
                "Error while trying to run {:?}: {}",
                cmd,
                e
            )
            .unwrap_or(());
        }
    }
    std::process::exit(0);
}

[5.88177]

[7.422]


    let opts = Opts::parse();

Replacement in pijul/src/main.rs at line 186 [5.83981]

B:BD[7.423] → [6.520:586]

∅:D[6.586] → [7.487:551]

B:BD[7.487] → [7.487:551]

B:BD[7.551] → [6.587:642]

∅:D[6.642] → [7.551:621]

B:BD[7.551] → [7.551:621]

B:BD[7.621] → [3.0:231]

∅:D[3.231] → [6.792:854]

B:BD[6.792] → [6.792:854]

∅:D[6.854] → [7.621:748]

B:BD[7.621] → [7.621:748]

B:BD[7.748] → [2.0:56]

∅:D[2.56] → [7.748:826]

B:BD[7.748] → [7.748:826]

fn external_command() -> Result<bool, (String, std::io::Error)> {
    let mut cmd = String::new();
    let mut args = Vec::new();
    use clap::IntoApp;
    let app = Opts::into_app();
    for arg in std::env::args().skip(1) {
        if cmd.is_empty() {
            if arg == "help"
                || arg.starts_with("--")
                || app
                    .get_subcommands()
                    .any(|sub| sub.get_name() == arg || sub.get_all_aliases().any(|al| al == arg))
            {
                return Ok(false);
            }
            cmd.push_str("pijul-");
            cmd.push_str(&arg)
        } else {
            args.push(arg)
        }
    }
    if cmd.is_empty() {
        return Ok(false);
    }
    if let Err(e) = run_external_command(&cmd, &args) {
        Err((cmd, e))

[7.423]

[7.826]

    if let Err(e) = run(opts).await {
        writeln!(std::io::stderr(), "Error: {}", e).unwrap_or(());
        std::process::exit(1);

Replacement in pijul/src/main.rs at line 190 [5.83981]
B:BD[7.839] → [6.855:872]
```
        Ok(true)
```
[7.839]
[7.854]
```
        std::process::exit(0);
```

Replacement in pijul/src/main.rs at line 195 [5.83981]

B:BD[7.876] → [7.876:960]

fn run_external_command(cmd: &str, args: &[String]) -> Result<(), std::io::Error> {

[7.876]

[7.960]

fn run_external_command(mut command: Vec<OsString>) -> Result<(), std::io::Error> {
    let args = command.split_off(1);
    let cmd = &command[0];

Replacement in pijul/src/main.rs at line 204 [5.83981]

B:BD[7.1082] → [7.1082:1166]

fn run_external_command(cmd: &str, args: &[String]) -> Result<(), std::io::Error> {

[7.1082]

[7.1166]

fn run_external_command(mut command: Vec<OsString>) -> Result<(), std::io::Error> {
    let args = command.split_off(1);
    let cmd = &command[0];

Insertion in pijul/src/main.rs at line 241 [5.83981]

[5.89705]

        SubCommand::ExternalSubcommand(command) => Ok(run_external_command(command)?),