@@ -702,67 +702,71 @@ fn show(cfg: &Cfg) -> Result<()> {
702
702
print_header ( "installed toolchains" )
703
703
}
704
704
let default_name = cfg. get_default ( ) ?;
705
- for t in installed_toolchains {
706
- if default_name == t {
707
- println ! ( "{} (default)" , t) ;
705
+ let mut t = term2:: stdout ( ) ;
706
+ for it in installed_toolchains {
707
+ if default_name == it {
708
+ let _ = writeln ! ( t, "{} (default)" , it) ;
708
709
} else {
709
- println ! ( "{}" , t ) ;
710
+ let _ = writeln ! ( t , "{}" , it ) ;
710
711
}
711
712
}
712
713
if show_headers {
713
- println ! ( "" )
714
- } ;
714
+ let _ = writeln ! ( t , "" ) ;
715
+ }
715
716
}
716
717
717
718
if show_active_targets {
718
719
if show_headers {
719
720
print_header ( "installed targets for active toolchain" ) ;
720
721
}
721
- for t in active_targets {
722
- println ! (
722
+ let mut t = term2:: stdout ( ) ;
723
+ for at in active_targets {
724
+ let _ = writeln ! ( t,
723
725
"{}" ,
724
- t . component
726
+ at . component
725
727
. target
726
728
. as_ref( )
727
729
. expect( "rust-std should have a target" )
728
730
) ;
729
731
}
730
732
if show_headers {
731
- println ! ( "" )
732
- } ;
733
+ let _ = writeln ! ( t , "" ) ;
734
+ }
733
735
}
734
736
735
737
if show_active_toolchain {
736
738
if show_headers {
737
739
print_header ( "active toolchain" )
738
740
}
739
741
742
+ let mut t = term2:: stdout ( ) ;
743
+
740
744
match active_toolchain {
741
745
Ok ( atc) => match atc {
742
746
Some ( ( ref toolchain, Some ( ref reason) ) ) => {
743
- println ! ( "{} ({})" , toolchain. name( ) , reason) ;
744
- println ! ( "{}" , common:: rustc_version( toolchain) ) ;
747
+ let _ = writeln ! ( t , "{} ({})" , toolchain. name( ) , reason) ;
748
+ let _ = writeln ! ( t , "{}" , common:: rustc_version( toolchain) ) ;
745
749
}
746
750
Some ( ( ref toolchain, None ) ) => {
747
- println ! ( "{} (default)" , toolchain. name( ) ) ;
748
- println ! ( "{}" , common:: rustc_version( toolchain) ) ;
751
+ let _ = writeln ! ( t , "{} (default)" , toolchain. name( ) ) ;
752
+ let _ = writeln ! ( t , "{}" , common:: rustc_version( toolchain) ) ;
749
753
}
750
754
None => {
751
- println ! ( "no active toolchain" ) ;
755
+ let _ = writeln ! ( t , "no active toolchain" ) ;
752
756
}
753
757
} ,
754
758
Err ( err) => {
755
759
if let Some ( cause) = err. source ( ) {
756
- println ! ( "(error: {}, {})" , err, cause) ;
760
+ let _ = writeln ! ( t , "(error: {}, {})" , err, cause) ;
757
761
} else {
758
- println ! ( "(error: {})" , err) ;
762
+ let _ = writeln ! ( t , "(error: {})" , err) ;
759
763
}
760
764
}
761
765
}
762
766
763
767
if show_headers {
764
- println ! ( "" )
765
- } ;
768
+ let _ = writeln ! ( t , "" ) ;
769
+ }
766
770
}
767
771
768
772
fn print_header ( s : & str ) {
0 commit comments