From 42fb9b2c5f0c791e2c369b2ec0562c968aed00de Mon Sep 17 00:00:00 2001 From: Haitao Li Date: Fri, 16 Dec 2011 17:08:24 +0800 Subject: [PATCH] cargo: Fix long lines --- src/cargo/cargo.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs index 757fa31d4e0..b4aca34da89 100644 --- a/src/cargo/cargo.rs +++ b/src/cargo/cargo.rs @@ -155,13 +155,17 @@ fn install_one_crate(c: cargo, _path: str, cf: str, _p: pkg) { name = str::slice(name, 0u, ri as uint); } log #fmt["Installing: %s", name]; - let old = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, fs::list_dir(".")); + let old = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, + fs::list_dir(".")); run::run_program("rustc", [name + ".rc"]); - let new = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, fs::list_dir(".")); - let created = vec::filter::({ |n| !vec::member::(n, old) }, new); + let new = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, + fs::list_dir(".")); + let created = + vec::filter::({ |n| !vec::member::(n, old) }, new); + let exec_suffix = os::exec_suffix(); for ct: str in created { - if (os::exec_suffix() != "" && str::ends_with(ct, os::exec_suffix())) || - (os::exec_suffix() == "" && !str::starts_with(ct, "lib")) { + if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) || + (exec_suffix == "" && !str::starts_with(ct, "lib")) { log #fmt[" bin: %s", ct]; // FIXME: need libstd fs::copy or something run::run_program("cp", [ct, c.bindir]); @@ -179,7 +183,8 @@ fn install_source(c: cargo, path: str) { log #fmt["contents: %s", str::connect(contents, ", ")]; - let cratefiles = vec::filter::({ |n| str::ends_with(n, ".rc") }, contents); + let cratefiles = + vec::filter::({ |n| str::ends_with(n, ".rc") }, contents); if vec::is_empty(cratefiles) { fail "This doesn't look like a rust package (no .rc files).";