Skip to content

Commit d3da492

Browse files
committed
---
yaml --- r: 81990 b: refs/heads/master c: 22ef7e7 h: refs/heads/master v: v3
1 parent fa2be80 commit d3da492

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 727d4c306c0a14f9d80f94231fd0e520f62fe143
2+
refs/heads/master: 22ef7e72f4c96b7688dad08c498a4389077d033a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/librustc/middle/lint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub type LintDict = HashMap<&'static str, LintSpec>;
135135
enum AttributedNode<'self> {
136136
Item(@ast::item),
137137
Method(&'self ast::method),
138-
Crate(@ast::Crate),
138+
Crate(&'self ast::Crate),
139139
}
140140

141141
#[deriving(Eq)]
@@ -1565,7 +1565,7 @@ impl Visitor<@mut Context> for LintCheckVisitor {
15651565
}
15661566
}
15671567

1568-
pub fn check_crate(tcx: ty::ctxt, crate: @ast::Crate) {
1568+
pub fn check_crate(tcx: ty::ctxt, crate: &ast::Crate) {
15691569
let cx = @mut Context {
15701570
dict: @get_lint_dict(),
15711571
curr: SmallIntMap::new(),

trunk/src/librustc/middle/reachable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl ReachableContext {
268268

269269
// Step 1: Mark all public symbols, and add all public symbols that might
270270
// be inlined to a worklist.
271-
fn mark_public_symbols(&self, crate: @Crate) {
271+
fn mark_public_symbols(&self, crate: &Crate) {
272272
let reachable_symbols = self.reachable_symbols;
273273
let worklist = self.worklist;
274274

@@ -429,7 +429,7 @@ impl ReachableContext {
429429

430430
pub fn find_reachable(tcx: ty::ctxt,
431431
method_map: typeck::method_map,
432-
crate: @Crate)
432+
crate: &Crate)
433433
-> @mut HashSet<NodeId> {
434434
// XXX(pcwalton): We only need to mark symbols that are exported. But this
435435
// is more complicated than just looking at whether the symbol is `pub`,

trunk/src/librustpkg/rustpkg.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,14 @@ impl CtxMethods for BuildContext {
620620
match built_test_in_workspace(pkgid, workspace) {
621621
Some(test_exec) => {
622622
debug!("test: test_exec = %s", test_exec.to_str());
623-
let status = run::process_status(test_exec.to_str(), [~"--test"]);
624-
os::set_exit_status(status);
623+
let p_output = run::process_output(test_exec.to_str(), [~"--test"]);
624+
if p_output.status == 0 {
625+
println(str::from_utf8(p_output.output));
626+
}
627+
else {
628+
println(str::from_utf8(p_output.error));
629+
}
630+
os::set_exit_status(p_output.status);
625631
}
626632
None => {
627633
error(fmt!("Internal error: test executable for package ID %s in workspace %s \

0 commit comments

Comments
 (0)