mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert package list to dvec (cc )

Browse Source
This commit is contained in:
Niko Matsakis 2012-09-13 09:13:28 -07:00
parent 109055c7d3
commit 0a504890f3
1 changed files with 27 additions and 32 deletions

59
src/cargo/cargo.rs

@ -13,6 +13,7 @@ use std::{map, json, tempfile, term, sort, getopts};
use map::HashMap; use map::HashMap;
use to_str::to_str; use to_str::to_str;
use getopts::{optflag, optopt, opt_present}; use getopts::{optflag, optopt, opt_present};
use dvec::DVec;
type package = { type package = {
name: ~str, name: ~str,
@ -60,7 +61,7 @@ type source = @{
mut method: ~str, mut method: ~str,
mut key: Option<~str>, mut key: Option<~str>,
mut keyfp: Option<~str>, mut keyfp: Option<~str>,
mut packages: ~[mut package] packages: DVec<package>
}; };
type cargo = { type cargo = {
@ -448,7 +449,7 @@ fn parse_source(name: ~str, j: json::Json) -> source {
mut method: method, mut method: method,
mut key: key, mut key: key,
mut keyfp: keyfp, mut keyfp: keyfp,
mut packages: ~[mut] }; packages: DVec() };
} }
_ => fail ~"needed dict value in source" _ => fail ~"needed dict value in source"
}; };
@ -558,14 +559,14 @@ fn load_one_source_package(src: source, p: map::HashMap<~str, json::Json>) {
versions: ~[] versions: ~[]
}; };
match vec::position(src.packages, |pkg| pkg.uuid == uuid) { match src.packages.position(|pkg| pkg.uuid == uuid) {
Some(idx) => { Some(idx) => {
src.packages[idx] = newpkg; src.packages.set_elt(idx, newpkg);
log(debug, ~" updated package: " + src.name + ~"/" + name); log(debug, ~" updated package: " + src.name + ~"/" + name);
} }
None => { None => {
vec::grow(src.packages, 1u, newpkg); src.packages.push(newpkg);
} }
} }
log(debug, ~" loaded package: " + src.name + ~"/" + name); log(debug, ~" loaded package: " + src.name + ~"/" + name);
@ -713,10 +714,7 @@ fn configure(opts: options) -> cargo {
fn for_each_package(c: cargo, b: fn(source, package)) { fn for_each_package(c: cargo, b: fn(source, package)) {
for c.sources.each_value |v| { for c.sources.each_value |v| {
// FIXME (#2280): this temporary shouldn't be for v.packages.each |p| {
// necessary, but seems to be, for borrowing.
let pks = copy v.packages;
for vec::each(pks) |p| {
b(v, p); b(v, p);
} }
} }
@ -948,16 +946,15 @@ fn install_named(c: cargo, wd: &Path, name: ~str) {
fn install_uuid_specific(c: cargo, wd: &Path, src: ~str, uuid: ~str) { fn install_uuid_specific(c: cargo, wd: &Path, src: ~str, uuid: ~str) {
match c.sources.find(src) { match c.sources.find(src) {
Some(s) => { Some(s) => {
let packages = copy s.packages; for s.packages.each |p| {
if vec::any(packages, |p| { if p.uuid == uuid {
if p.uuid == uuid { install_package(c, src, wd, p);
install_package(c, src, wd, p); return;
true }
} else { false } }
}) { return; } }
} _ => ()
_ => ()
} }
error(~"can't find package: " + src + ~"/" + uuid); error(~"can't find package: " + src + ~"/" + uuid);
} }
@ -965,13 +962,12 @@ fn install_uuid_specific(c: cargo, wd: &Path, src: ~str, uuid: ~str) {
fn install_named_specific(c: cargo, wd: &Path, src: ~str, name: ~str) { fn install_named_specific(c: cargo, wd: &Path, src: ~str, name: ~str) {
match c.sources.find(src) { match c.sources.find(src) {
Some(s) => { Some(s) => {
let packages = copy s.packages; for s.packages.each |p| {
if vec::any(packages, |p| {
if p.name == name { if p.name == name {
install_package(c, src, wd, p); install_package(c, src, wd, p);
true return;
} else { false } }
}) { return; } }
} }
_ => () _ => ()
} }
@ -1500,8 +1496,7 @@ fn print_pkg(s: source, p: package) {
fn print_source(s: source) { fn print_source(s: source) {
info(s.name + ~" (" + s.url + ~")"); info(s.name + ~" (" + s.url + ~")");
let unsorted_pks = s.packages; // to prevent illegal borrow? let pks = sort::merge_sort(sys::shape_lt, s.packages.get());
let pks = sort::merge_sort(sys::shape_lt, unsorted_pks);
let l = vec::len(pks); let l = vec::len(pks);
print(io::with_str_writer(|writer| { print(io::with_str_writer(|writer| {
@ -1685,7 +1680,7 @@ fn cmd_sources(c: cargo) {
mut method: assume_source_method(url), mut method: assume_source_method(url),
mut key: None, mut key: None,
mut keyfp: None, mut keyfp: None,
mut packages: ~[mut] packages: DVec()
}); });
info(fmt!("added source: %s", name)); info(fmt!("added source: %s", name));
} }