about summary refs log tree commit diff
diff options
context:
space:
mode:
authorElly Jones <elly@leptoquark.net>2011-12-16 22:27:04 -0500
committerElly Jones <elly@leptoquark.net>2011-12-16 22:27:04 -0500
commit9a0b89b5341c93a071e8a5be78b3fb066b12c5ba (patch)
treef359c8456ed2dd6963fa54ca8b983e5ce0b2478c
parent327af5b9f3cd9ec6963b3c75fec8510a23916750 (diff)
downloadrust-9a0b89b5341c93a071e8a5be78b3fb066b12c5ba.tar.gz
rust-9a0b89b5341c93a071e8a5be78b3fb066b12c5ba.zip
cargo: fix some warnings
-rw-r--r--src/cargo/cargo.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs
index 2ed16273c32..f7b3cd21168 100644
--- a/src/cargo/cargo.rs
+++ b/src/cargo/cargo.rs
@@ -184,7 +184,7 @@ fn try_parse_sources(filename: str, sources: map::hashmap<str, source>) {
     }
 }
 
-fn load_one_source_package(&c: cargo, &src: source, p: map::hashmap<str, json::json>) {
+fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
     let name = alt p.find("name") {
         some(json::string(_n)) { _n }
         _ {
@@ -239,7 +239,7 @@ fn load_source_packages(&c: cargo, &src: source) {
             for _j: json::json in *js {
                 alt _j {
                     json::dict(_p) {
-                        load_one_source_package(c, src, _p);
+                        load_one_source_package(src, _p);
                     }
                     _ {
                         warn("Malformed source json: " + src.name + " (non-dict pkg)");
@@ -364,6 +364,7 @@ fn install_curl(c: cargo, wd: str, url: str) {
     }
     run::run_program("tar", ["-x", "--strip-components=1",
                              "-C", wd, "-f", tarpath]);
+    install_source(c, wd);
 }
 
 fn install_file(c: cargo, wd: str, path: str) {
@@ -414,7 +415,7 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
         }
     });
     if vec::len(ps) == 1u {
-        let (s, p) = ps[0];
+        let (_, p) = ps[0];
         install_package(c, wd, p);
         ret;
     } else if vec::len(ps) == 0u {
@@ -435,7 +436,7 @@ fn install_named(c: cargo, wd: str, name: str) {
         }
     });
     if vec::len(ps) == 1u {
-        let (s, p) = ps[0];
+        let (_, p) = ps[0];
         install_package(c, wd, p);
         ret;
     } else if vec::len(ps) == 0u {