File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 727d4c306c0a14f9d80f94231fd0e520f62fe143
2
+ refs/heads/master: 22ef7e72f4c96b7688dad08c498a4389077d033a
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5
5
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ pub type LintDict = HashMap<&'static str, LintSpec>;
135
135
enum AttributedNode < ' self > {
136
136
Item ( @ast:: item ) ,
137
137
Method ( & ' self ast:: method ) ,
138
- Crate ( @ ast:: Crate ) ,
138
+ Crate ( & ' self ast:: Crate ) ,
139
139
}
140
140
141
141
#[ deriving( Eq ) ]
@@ -1565,7 +1565,7 @@ impl Visitor<@mut Context> for LintCheckVisitor {
1565
1565
}
1566
1566
}
1567
1567
1568
- pub fn check_crate ( tcx : ty:: ctxt , crate : @ ast:: Crate ) {
1568
+ pub fn check_crate ( tcx : ty:: ctxt , crate : & ast:: Crate ) {
1569
1569
let cx = @mut Context {
1570
1570
dict : @get_lint_dict ( ) ,
1571
1571
curr : SmallIntMap :: new ( ) ,
Original file line number Diff line number Diff line change @@ -268,7 +268,7 @@ impl ReachableContext {
268
268
269
269
// Step 1: Mark all public symbols, and add all public symbols that might
270
270
// be inlined to a worklist.
271
- fn mark_public_symbols ( & self , crate : @ Crate ) {
271
+ fn mark_public_symbols ( & self , crate : & Crate ) {
272
272
let reachable_symbols = self . reachable_symbols ;
273
273
let worklist = self . worklist ;
274
274
@@ -429,7 +429,7 @@ impl ReachableContext {
429
429
430
430
pub fn find_reachable ( tcx : ty:: ctxt ,
431
431
method_map : typeck:: method_map ,
432
- crate : @ Crate )
432
+ crate : & Crate )
433
433
-> @mut HashSet < NodeId > {
434
434
// XXX(pcwalton): We only need to mark symbols that are exported. But this
435
435
// is more complicated than just looking at whether the symbol is `pub`,
Original file line number Diff line number Diff line change @@ -620,8 +620,14 @@ impl CtxMethods for BuildContext {
620
620
match built_test_in_workspace ( pkgid, workspace) {
621
621
Some ( test_exec) => {
622
622
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 ) ;
625
631
}
626
632
None => {
627
633
error ( fmt ! ( "Internal error: test executable for package ID %s in workspace %s \
You can’t perform that action at this time.
0 commit comments