RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 13:37:48 +00:00
Code Issues Activity

Merge pull request #608 from jbcrail/rm-unstable-exit-status

Browse source 
Replace unstable set_exit_status() with exit().
This commit is contained in:
Heather 2015-05-19 07:15:14 +03:00
commit e7518b3eae
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mkmain.rs
View file

@ -1,17 +1,15 @@
#![feature(exit_status)]
use std::env; use std::env;
use std::io::Write; use std::io::Write;
use std::fs::File; use std::fs::File;
static TEMPLATE: &'static str = "\ static TEMPLATE: &'static str = "\
#![feature(exit_status)]
extern crate @UTIL_CRATE@ as uu@UTIL_CRATE@; extern crate @UTIL_CRATE@ as uu@UTIL_CRATE@;
use std::env; use std::env;
use uu@UTIL_CRATE@::uumain; use uu@UTIL_CRATE@::uumain;
fn main() { fn main() {
env::set_exit_status(uumain(env::args().collect())); std::process::exit(uumain(env::args().collect()));
} }
"; ";
@ -19,8 +17,7 @@ fn main() {
let args : Vec<String> = env::args().collect(); let args : Vec<String> = env::args().collect();
if args.len() != 3 { if args.len() != 3 {
println!("usage: mkbuild <crate> <outfile>"); println!("usage: mkbuild <crate> <outfile>");
env::set_exit_status(1); std::process::exit(1);
return;
} }
let crat = match &args[1][..] { let crat = match &args[1][..] {

5
mkuutils.rs
View file

@ -1,5 +1,3 @@
#![feature(exit_status)]
use std::env; use std::env;
use std::fs::File; use std::fs::File;
use std::io::{Read, Write}; use std::io::{Read, Write};
@ -8,8 +6,7 @@ fn main() {
let args : Vec<String> = env::args().collect(); let args : Vec<String> = env::args().collect();
if args.len() < 3 { if args.len() < 3 {
println!("usage: mkuutils <outfile> <crates>"); println!("usage: mkuutils <outfile> <crates>");
env::set_exit_status(1); std::process::exit(1);
return;
} }
let mut crates = String::new(); let mut crates = String::new();

18
src/uutils/uutils.rs
View file

@ -1,5 +1,5 @@
#![crate_name = "uutils"] #![crate_name = "uutils"]
#![feature(exit_status, rustc_private)] #![feature(rustc_private)]
/* /*
* This file is part of the uutils coreutils package. * This file is part of the uutils coreutils package.
@ -53,7 +53,7 @@ fn main() {
match umap.get(binary_as_util) { match umap.get(binary_as_util) {
Some(&uumain) => { Some(&uumain) => {
env::set_exit_status(uumain(args)); std::process::exit(uumain(args));
return return
} }
None => (), None => (),
@ -66,7 +66,7 @@ fn main() {
// what busybox uses the -suffix pattern for. // what busybox uses the -suffix pattern for.
} else { } else {
println!("{}: applet not found", binary_as_util); println!("{}: applet not found", binary_as_util);
env::set_exit_status(1); std::process::exit(1);
return return
} }
@ -77,7 +77,7 @@ fn main() {
match umap.get(util) { match umap.get(util) {
Some(&uumain) => { Some(&uumain) => {
env::set_exit_status(uumain(args.clone())); std::process::exit(uumain(args.clone()));
return return
} }
None => { None => {
@ -87,22 +87,22 @@ fn main() {
let util = &args[1][..]; let util = &args[1][..];
match umap.get(util) { match umap.get(util) {
Some(&uumain) => { Some(&uumain) => {
env::set_exit_status(uumain(vec![util.to_string(), "--help".to_string()])); std::process::exit(uumain(vec![util.to_string(), "--help".to_string()]));
return return
} }
None => { None => {
println!("{}: applet not found", util); println!("{}: applet not found", util);
env::set_exit_status(1); std::process::exit(1);
return return
} }
} }
} }
usage(&umap); usage(&umap);
env::set_exit_status(0); std::process::exit(0);
return return
} else { } else {
println!("{}: applet not found", util); println!("{}: applet not found", util);
env::set_exit_status(1); std::process::exit(1);
return return
} }
} }
@ -110,7 +110,7 @@ fn main() {
} else { } else {
// no arguments provided // no arguments provided
usage(&umap); usage(&umap);
env::set_exit_status(0); std::process::exit(0);
return return
} }
} }