---

yaml
---
r: 13070
b: refs/heads/master
c: 360194d
h: refs/heads/master
v: v3

Author: bkircher

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1aa080463766da23d6c24366b258df251f55b39e
+refs/heads/master: 360194d282e1d819f45347f923dbe3e6ba2c815e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/cargo/cargo.rs

@@ -61,14 +61,12 @@ type options = {
     test: bool,
     mode: mode,
     free: [str],
-    help: bool,
 };
 
 enum mode { system_mode, user_mode, local_mode }
 
 fn opts() -> [getopts::opt] {
-    [optflag("g"), optflag("G"), optopt("mode"), optflag("test"),
-     optflag("h"), optflag("help")]
+    [optflag("g"), optflag("G"), optopt("mode"), optflag("test")]
 }
 
 fn info(msg: str) {
@@ -174,7 +172,7 @@ fn rest(s: str, start: uint) -> str {
 
 fn need_dir(s: str) {
     if os::path_is_dir(s) { ret; }
-    if !os::make_dir(s, 493_i32 /* oct: 755 */) {
+    if !os::make_dir(s, 0x1c0i32) {
         fail #fmt["can't make_dir %s", s];
     }
 }
@@ -339,55 +337,49 @@ fn build_cargo_options(argv: [str]) -> options {
     };
 
     let test = opt_present(match, "test");
-    let G    = opt_present(match, "G");
-    let g    = opt_present(match, "g");
-    let m    = opt_present(match, "mode");
-    let help = opt_present(match, "h") || opt_present(match, "help");
-
+    let G = opt_present(match, "G");
+    let g = opt_present(match, "g");
+    let m = opt_present(match, "mode");
     let is_install = vec::len(match.free) > 1u && match.free[1] == "install";
 
     if G && g { fail "-G and -g both provided"; }
     if g && m { fail "--mode and -g both provided"; }
     if G && m { fail "--mode and -G both provided"; }
 
-    if !is_install && (g || G || m) {
-        fail "-g, -G, --mode are only valid for `install`";
-    }
-
-    let mode =
-        if !is_install || G { system_mode }
-        else if  g { user_mode }
-        else if !m { local_mode }
-        else {
+    let mode = if is_install {
+        if G { system_mode }
+        else if g { user_mode }
+        else if m {
             alt getopts::opt_str(match, "mode") {
                 "system" { system_mode }
-                "user"   { user_mode }
-                "local"  { local_mode }
-                _        { fail "argument to `mode` must be" +
-                                "one of `system`, `user`, or `local`"; }}
-        };
+                "user" { user_mode }
+                "local" { local_mode }
+                _ { fail "argument to `mode` must be one of `system`" +
+                    ", `user`, or `local`";
+                }
+            }
+        } else { local_mode }
+    } else { system_mode };
 
-    {test: test, mode: mode, free: match.free, help: help}
+    {test: test, mode: mode, free: match.free}
 }
 
 fn configure(opts: options) -> cargo {
-    // NOTE: to make init and sync save into non-root level directories
-    // simply get rid of syscargo, below
-
     let syscargo = result::get(get_cargo_sysroot());
-
     let get_cargo_dir = alt opts.mode {
         system_mode { get_cargo_sysroot }
         user_mode { get_cargo_root }
         local_mode { get_cargo_root_nearest }
     };
 
-    let p = result::get(get_cargo_dir());
+    let p = alt get_cargo_dir() {
+        result::ok(p) { p }
+        result::err(e) { fail e }
+    };
 
     let sources = map::str_hash::<source>();
     try_parse_sources(path::connect(syscargo, "sources.json"), sources);
     try_parse_sources(path::connect(syscargo, "local-sources.json"), sources);
-
     let mut c = {
         pgp: pgp::supported(),
         root: p,
@@ -475,20 +467,17 @@ fn install_one_crate(c: cargo, path: str, cf: str) {
     let newv = os::list_dir_path(buildpath);
     let exec_suffix = os::exe_suffix();
     for newv.each {|ct|
-        // FIXME: What's up with the dual installation?  Both `install_to_dir`
-        // and `install_one_crate_to_sysroot` install the binary files...
-
         if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) ||
             (exec_suffix == "" && !str::starts_with(path::basename(ct),
                                                     "lib")) {
             #debug("  bin: %s", ct);
-            install_to_dir(ct, c.bindir);
+            copy_warn(ct, c.bindir);
             if c.opts.mode == system_mode {
                 install_one_crate_to_sysroot(ct, "bin");
             }
         } else {
             #debug("  lib: %s", ct);
-            install_to_dir(ct, c.bindir);
+            copy_warn(ct, c.bindir);
             if c.opts.mode == system_mode {
                 install_one_crate_to_sysroot(ct, libdir());
             }
@@ -502,7 +491,7 @@ fn install_one_crate_to_sysroot(ct: str, target: str) {
             let path = [_path, "..", target];
             check vec::is_not_empty(path);
             let target_dir = path::normalize(path::connect_many(path));
-            install_to_dir(ct, target_dir);
+            copy_warn(ct, target_dir);
         }
         none { }
     }
@@ -695,10 +684,9 @@ fn cmd_install(c: cargo) unsafe {
 
     let target = c.opts.free[2];
 
-    let wd_base = c.workdir + path::path_sep();
-    let wd = alt tempfile::mkdtemp(wd_base, "") {
+    let wd = alt tempfile::mkdtemp(c.workdir + path::path_sep(), "") {
         some(_wd) { _wd }
-        none { fail #fmt("needed temp dir: %s", wd_base); }
+        none { fail "needed temp dir"; }
     };
 
     if str::starts_with(target, "uuid:") {
@@ -814,9 +802,9 @@ fn cmd_init(c: cargo) {
 
     let r = pgp::verify(c.root, srcfile, sigfile, pgp::signing_key_fp());
     if !r {
-        warn(#fmt["signature verification failed for '%s'", srcfile]);
+        warn(#fmt["signature verification failed for sources.json"]);
     } else {
-        info(#fmt["signature ok for '%s'", srcfile]);
+        info(#fmt["signature ok for sources.json"]);
     }
     copy_warn(srcfile, destsrcfile);
 
@@ -859,56 +847,44 @@ fn cmd_search(c: cargo) {
     info(#fmt["Found %d packages.", n]);
 }
 
-fn install_to_dir(srcfile: str, destdir: str) {
-    let newfile = path::connect(destdir, path::basename(srcfile));
-    info(#fmt["Installing '%s'...", newfile]);
-
-    run::run_program("cp", [srcfile, newfile]);
-}
-
-fn copy_warn(srcfile: str, destfile: str) {
-  if !os::copy_file(srcfile, destfile) {
-      warn(#fmt["Copying %s to %s failed", srcfile, destfile]);
+fn copy_warn(src: str, dest: str) {
+  if !os::copy_file(src, dest) {
+      warn(#fmt["Copying %s to %s failed", src, dest]);
   }
 }
 
-// FIXME: decide on either [-g | -G] or [--mode=...] and remove the other
 fn cmd_usage() {
-    print("Usage: cargo <verb> [options] [args...]\n" +
-          " e.g.: cargo [init | sync]\n" +
-          " e.g.: cargo install [-g | -G | --mode=MODE] ] [PACKAGE...]
-
-Initialization:
-    init           Set up the cargo system near this binary,
-                   for example, at  /usr/local/lib/cargo/
-    sync           Sync all package sources
-
-Querying:
-    list [source]                        List packages
-    search <name | '*'> [tags...]        Search packages
-    usage                                Display this message
-
-Package installation:
-    [options] [source/]PKGNAME           Install a package by name
-    [options] uuid:[source/]PKGUUID      Install a package by uuid
-
-Package installation options:
-    --mode=MODE    Install to one of the following locations:
-                   local (./.cargo/bin/, which is the default),
-                   user (~/.cargo/bin/), or system (/usr/local/lib/cargo/bin/)
-    --test         Run crate tests before installing
-    -g             Equivalent to --mode=user
-    -G             Equivalent to --mode=system
-
-Other:
-    -h, --help     Display this message
+    print("Usage: cargo <verb> [options] [args...]" +
+          "
+
+    init                                          Set up .cargo
+    install [options] [source/]package-name       Install by name
+    install [options] uuid:[source/]package-uuid  Install by uuid
+    list [source]                                 List packages
+    search <name | '*'> [tags...]                 Search packages
+    sync                                          Sync all sources
+    usage                                         This
+
+Options:
+
+  cargo install
+
+    --mode=[system,user,local]   change mode as (system/user/local)
+    --test                       run crate tests before installing
+    -g                           equivalent to --mode=user
+    -G                           equivalent to --mode=system
+
+NOTE:
+\"cargo install\" installs bin/libs to local-level .cargo by default.
+To install them into user-level .cargo,  use option -g/--mode=user.
+To install them into bin/lib on sysroot, use option -G/--mode=system.
 ");
 }
 
 fn main(argv: [str]) {
     let o = build_cargo_options(argv);
 
-    if vec::len(o.free) < 2u || o.help {
+    if vec::len(o.free) < 2u {
         cmd_usage();
         ret;
     }

trunk/src/libstd/bitv.rs

@@ -197,6 +197,7 @@ fn each(v: bitv, f: fn(bool) -> bool) {
     let mut i = 0u;
     while i < v.nbits {
         if !f(get(v, i)) { break; }
+        i = i + 1u;
     }
 }
 
@@ -233,6 +234,15 @@ fn eq_vec(v0: bitv, v1: [uint]) -> bool {
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn test_to_str() {
+        let zerolen = bitv(0u, false);
+        assert to_str(zerolen) == "";
+
+        let eightbits = bitv(8u, false);
+        assert to_str(eightbits) == "00000000";
+    }
+
     #[test]
     fn test_0_elements() {
         let mut act;