RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 14:07:46 +00:00
Code Issues Activity

os::args -> env::args

Browse source
This commit is contained in:
Michael Gehring 2015-02-06 15:04:02 +01:00
parent e7b647171f
commit 910fd61070
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mkmain.rs
View file

@ -1,7 +1,6 @@
#![feature(core, env, io, os, path)] #![feature(core, env, io, os, path)]
use std::env; use std::env;
use std::old_io::{File, Truncate, ReadWrite}; use std::old_io::{File, Truncate, ReadWrite};
use std::os;
use std::old_path::Path; use std::old_path::Path;
static TEMPLATE: &'static str = "\ static TEMPLATE: &'static str = "\
@ -9,16 +8,19 @@ static TEMPLATE: &'static str = "\
extern crate \"@UTIL_CRATE@\" as uu@UTIL_CRATE@; extern crate \"@UTIL_CRATE@\" as uu@UTIL_CRATE@;
use std::env; use std::env;
use std::os;
use uu@UTIL_CRATE@::uumain; use uu@UTIL_CRATE@::uumain;
fn args() -> Vec<String> {
env::args().map(|a| a.into_string().unwrap()).collect()
}
fn main() { fn main() {
env::set_exit_status(uumain(os::args())); env::set_exit_status(uumain(args()));
} }
"; ";
fn main() { fn main() {
let args = os::args(); let args : Vec<String> = env::args().map(|a| a.into_string().unwrap()).collect();
if args.len() != 3 { if args.len() != 3 {
println!("usage: mkbuild <crate> <outfile>"); println!("usage: mkbuild <crate> <outfile>");
env::set_exit_status(1); env::set_exit_status(1);

2
mkuutils.rs
View file

@ -6,7 +6,7 @@ use std::os;
use std::old_path::Path; use std::old_path::Path;
fn main() { fn main() {
let args = os::args(); let args : Vec<String> = env::args().map(|a| a.into_string().unwrap()).collect();
if args.len() < 3 { if args.len() < 3 {
println!("usage: mkuutils <outfile> <crates>"); println!("usage: mkuutils <outfile> <crates>");
env::set_exit_status(1); env::set_exit_status(1);

2
src/tee/tee.rs
View file

@ -150,5 +150,5 @@ fn with_path<F, T>(path: &Path, mut cb: F) -> IoResult<T> where F: FnMut() -> Io
} }
fn warn(message: &str) { fn warn(message: &str) {
error!("{}: {}", os::args()[0], message); error!("tee: {}", message);
} }

2
src/uutils/uutils.rs
View file

@ -42,7 +42,7 @@ fn usage(cmap: &HashMap<&'static str, fn(Vec<String>) -> i32>) {
fn main() { fn main() {
let umap = util_map(); let umap = util_map();
let mut args = os::args(); let mut args : Vec<String> = env::args().map(|a| a.into_string().unwrap()).collect();
// try binary name as util name. // try binary name as util name.
let binary = Path::new(args[0].as_slice()); let binary = Path::new(args[0].as_slice());