File tree 1 file changed +5
-8
lines changed
1 file changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -162,7 +162,6 @@ struct Ctx {
162
162
fn dest_dir(pkgid: PkgId) -> Path {
163
163
default_dest_dir(&pkgid.path).expect(
164
164
~"couldn't make default dir?!")
165
-
166
165
}
167
166
168
167
/// Returns the default output directory for compilation.
@@ -339,23 +338,21 @@ impl Ctx {
339
338
// Always use the "build" subdirectory of the package dir,
340
339
// but we should allow this to be configured
341
340
let dst_dir = dest_dir(pkgid);
342
-
341
+
343
342
let mut src = PkgSrc::new(cwd, &dst_dir, &pkgid);
344
-
345
343
match src.package_script_option(cwd) {
346
344
Some(script_path) => {
347
345
let script = PkgScript::parse(script_path, pkgid);
348
346
let (_, status) = script.run_custom(cmd); // Ignore cfgs?
349
347
if status == 42 { // ???
350
348
util::error(~"no fns are listening for that cmd");
351
-
352
349
return false;
353
350
}
354
-
355
351
status == 0
356
352
}
357
353
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()));
359
356
false
360
357
}
361
358
}
@@ -929,8 +926,8 @@ impl PkgSrc {
929
926
dst_dir,
930
927
crate.flags,
931
928
crate.cfgs + cfgs,
932
- false, test);
933
- if !result {
929
+ false, test);
930
+ if !result {
934
931
build_err::cond.raise(fmt!("build failure on %s",
935
932
path.to_str()));
936
933
}
You can’t perform that action at this time.
0 commit comments