Skip to content

Commit 74fee15

Browse files
committed
Tidy
1 parent 8158dd7 commit 74fee15

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/librustpkg/rustpkg.rc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ struct Ctx {
162162
fn dest_dir(pkgid: PkgId) -> Path {
163163
default_dest_dir(&pkgid.path).expect(
164164
~"couldn't make default dir?!")
165-
166165
}
167166

168167
/// Returns the default output directory for compilation.
@@ -339,23 +338,21 @@ impl Ctx {
339338
// Always use the "build" subdirectory of the package dir,
340339
// but we should allow this to be configured
341340
let dst_dir = dest_dir(pkgid);
342-
341+
343342
let mut src = PkgSrc::new(cwd, &dst_dir, &pkgid);
344-
345343
match src.package_script_option(cwd) {
346344
Some(script_path) => {
347345
let script = PkgScript::parse(script_path, pkgid);
348346
let (_, status) = script.run_custom(cmd); // Ignore cfgs?
349347
if status == 42 { // ???
350348
util::error(~"no fns are listening for that cmd");
351-
352349
return false;
353350
}
354-
355351
status == 0
356352
}
357353
None => {
358-
util::error(fmt!("invoked `do`, but there is no package script in %s", cwd.to_str()));
354+
util::error(fmt!("invoked `do`, but there is no package script in %s",
355+
cwd.to_str()));
359356
false
360357
}
361358
}
@@ -929,8 +926,8 @@ impl PkgSrc {
929926
dst_dir,
930927
crate.flags,
931928
crate.cfgs + cfgs,
932-
false, test);
933-
if !result {
929+
false, test);
930+
if !result {
934931
build_err::cond.raise(fmt!("build failure on %s",
935932
path.to_str()));
936933
}

0 commit comments

Comments
 (0)