@@ -557,8 +557,8 @@ fn load_source_info(c: cargo, src: source) {
557
557
if !os:: path_exists( srcfile) { ret; }
558
558
let srcstr = io:: read_whole_file_str( srcfile) ;
559
559
alt json:: from_str( result:: get( srcstr) ) {
560
- ok( json:: dict( _s ) ) {
561
- let o = parse_source( src. name, json:: dict( _s ) ) ;
560
+ ok( json:: dict( s ) ) {
561
+ let o = parse_source( src. name, json:: dict( s ) ) ;
562
562
563
563
src. key = o. key;
564
564
src. keyfp = o. keyfp;
@@ -635,7 +635,7 @@ fn build_cargo_options(argv: [str]) -> options {
635
635
636
636
fn configure( opts: options) -> cargo {
637
637
let home = alt get_cargo_root( ) {
638
- ok( _home ) { _home }
638
+ ok( home ) { home }
639
639
err( _err) { result:: get( get_cargo_sysroot( ) ) }
640
640
} ;
641
641
@@ -647,11 +647,11 @@ fn configure(opts: options) -> cargo {
647
647
648
648
let p = result:: get( get_cargo_dir( ) ) ;
649
649
650
- let sources = map:: str_hash:: <source> ( ) ;
650
+ let sources = map:: str_hash( ) ;
651
651
try_parse_sources( path:: connect( home, "sources. json") , sources) ;
652
652
try_parse_sources( path:: connect( home, "local-sources. json") , sources) ;
653
653
654
- let dep_cache = map:: str_hash:: < bool > ( ) ;
654
+ let dep_cache = map:: str_hash( ) ;
655
655
656
656
let mut c = {
657
657
pgp: pgp:: supported( ) ,
@@ -799,7 +799,7 @@ fn install_source(c: cargo, path: str) {
799
799
800
800
let wd_base = c. workdir + path:: path_sep( ) ;
801
801
let wd = alt tempfile:: mkdtemp( wd_base, "") {
802
- some( _wd ) { _wd }
802
+ some( wd ) { wd }
803
803
none { fail #fmt( "needed temp dir: %s", wd_base) ; }
804
804
} ;
805
805
@@ -819,8 +819,8 @@ fn install_source(c: cargo, path: str) {
819
819
820
820
fn install_git( c: cargo, wd: str , url: str , ref : option<str >) {
821
821
run:: program_output( "git", [ "clone", url, wd] ) ;
822
- if option:: is_some:: < str > ( ref ) {
823
- let r = option:: get:: < str > ( ref ) ;
822
+ if option:: is_some( ref ) {
823
+ let r = option:: get( ref ) ;
824
824
os:: change_dir( wd) ;
825
825
run:: run_program( "git", [ "checkout", r] ) ;
826
826
}
@@ -1021,8 +1021,8 @@ fn cmd_uninstall(c: cargo) {
1021
1021
1022
1022
fn install_query( c: cargo, wd: str , target: str ) {
1023
1023
alt c. dep_cache. find( target) {
1024
- some( _inst ) {
1025
- if _inst {
1024
+ some( inst ) {
1025
+ if inst {
1026
1026
ret;
1027
1027
}
1028
1028
}
@@ -1082,7 +1082,7 @@ fn install_query(c: cargo, wd: str, target: str) {
1082
1082
fn cmd_install( c: cargo) unsafe {
1083
1083
let wd_base = c. workdir + path:: path_sep( ) ;
1084
1084
let wd = alt tempfile:: mkdtemp( wd_base, "") {
1085
- some( _wd ) { _wd }
1085
+ some( wd ) { wd }
1086
1086
none { fail #fmt( "needed temp dir: %s", wd_base) ; }
1087
1087
} ;
1088
1088
0 commit comments