OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make cargo a little more ideomatic

Browse Source
This commit is contained in:
Erick Tryzelaar 2012-06-13 09:34:43 -07:00
parent 11a56c3e91
commit 065fa9a462
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cargo/cargo.rs
View File

@ -557,8 +557,8 @@ fn load_source_info(c: cargo, src: source) {
if !os::path_exists(srcfile) { ret; }
let srcstr = io::read_whole_file_str(srcfile);
alt json::from_str(result::get(srcstr)) {
ok(json::dict(_s)) {
let o = parse_source(src.name, json::dict(_s));
ok(json::dict(s)) {
let o = parse_source(src.name, json::dict(s));
src.key = o.key;
src.keyfp = o.keyfp;
@ -635,7 +635,7 @@ fn build_cargo_options(argv: [str]) -> options {
fn configure(opts: options) -> cargo {
let home = alt get_cargo_root() {
ok(_home) { _home }
ok(home) { home }
err(_err) { result::get(get_cargo_sysroot()) }
};
@ -647,11 +647,11 @@ fn configure(opts: options) -> cargo {
let p = result::get(get_cargo_dir());
let sources = map::str_hash::<source>();
let sources = map::str_hash();
try_parse_sources(path::connect(home, "sources.json"), sources);
try_parse_sources(path::connect(home, "local-sources.json"), sources);
let dep_cache = map::str_hash::<bool>();
let dep_cache = map::str_hash();
let mut c = {
pgp: pgp::supported(),
@ -799,7 +799,7 @@ fn install_source(c: cargo, path: str) {
let wd_base = c.workdir + path::path_sep();
let wd = alt tempfile::mkdtemp(wd_base, "") {
some(_wd) { _wd }
some(wd) { wd }
none { fail #fmt("needed temp dir: %s", wd_base); }
};
@ -819,8 +819,8 @@ fn install_source(c: cargo, path: str) {
fn install_git(c: cargo, wd: str, url: str, ref: option<str>) {
run::program_output("git", ["clone", url, wd]);
if option::is_some::<str>(ref) {
let r = option::get::<str>(ref);
if option::is_some(ref) {
let r = option::get(ref);
os::change_dir(wd);
run::run_program("git", ["checkout", r]);
}
@ -1021,8 +1021,8 @@ fn cmd_uninstall(c: cargo) {
fn install_query(c: cargo, wd: str, target: str) {
alt c.dep_cache.find(target) {
some(_inst) {
if _inst {
some(inst) {
if inst {
ret;
}
}
@ -1082,7 +1082,7 @@ fn install_query(c: cargo, wd: str, target: str) {
fn cmd_install(c: cargo) unsafe {
let wd_base = c.workdir + path::path_sep();
let wd = alt tempfile::mkdtemp(wd_base, "") {
some(_wd) { _wd }
some(wd) { wd }
none { fail #fmt("needed temp dir: %s", wd_base); }
};