Skip to content

Commit ddd857b

Browse files
author
Elly Jones
committed
---
yaml --- r: 6775 b: refs/heads/master c: 9a0b89b h: refs/heads/master i: 6773: e45408e 6771: 61be8fb 6767: 8d95b6a v: v3
1 parent bf94d25 commit ddd857b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 327af5b9f3cd9ec6963b3c75fec8510a23916750
2+
refs/heads/master: 9a0b89b5341c93a071e8a5be78b3fb066b12c5ba

trunk/src/cargo/cargo.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ fn try_parse_sources(filename: str, sources: map::hashmap<str, source>) {
184184
}
185185
}
186186

187-
fn load_one_source_package(&c: cargo, &src: source, p: map::hashmap<str, json::json>) {
187+
fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
188188
let name = alt p.find("name") {
189189
some(json::string(_n)) { _n }
190190
_ {
@@ -239,7 +239,7 @@ fn load_source_packages(&c: cargo, &src: source) {
239239
for _j: json::json in *js {
240240
alt _j {
241241
json::dict(_p) {
242-
load_one_source_package(c, src, _p);
242+
load_one_source_package(src, _p);
243243
}
244244
_ {
245245
warn("Malformed source json: " + src.name + " (non-dict pkg)");
@@ -364,6 +364,7 @@ fn install_curl(c: cargo, wd: str, url: str) {
364364
}
365365
run::run_program("tar", ["-x", "--strip-components=1",
366366
"-C", wd, "-f", tarpath]);
367+
install_source(c, wd);
367368
}
368369

369370
fn install_file(c: cargo, wd: str, path: str) {
@@ -414,7 +415,7 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
414415
}
415416
});
416417
if vec::len(ps) == 1u {
417-
let (s, p) = ps[0];
418+
let (_, p) = ps[0];
418419
install_package(c, wd, p);
419420
ret;
420421
} else if vec::len(ps) == 0u {
@@ -435,7 +436,7 @@ fn install_named(c: cargo, wd: str, name: str) {
435436
}
436437
});
437438
if vec::len(ps) == 1u {
438-
let (s, p) = ps[0];
439+
let (_, p) = ps[0];
439440
install_package(c, wd, p);
440441
ret;
441442
} else if vec::len(ps) == 0u {

0 commit comments

Comments
 (0)