---

yaml
---
r: 13448
b: refs/heads/master
c: 920ea63
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 78daa1540c62d9264816b344b429e6a63db7971a
+refs/heads/master: 920ea63f53bbbe46cdcbaead12720871b5fb00b9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/cargo/cargo.rs

@@ -557,8 +557,8 @@ fn load_source_info(c: cargo, src: source) {
     if !os::path_exists(srcfile) { ret; }
     let srcstr = io::read_whole_file_str(srcfile);
     alt json::from_str(result::get(srcstr)) {
-        ok(json::dict(s)) {
-            let o = parse_source(src.name, json::dict(s));
+        ok(json::dict(_s)) {
+            let o = parse_source(src.name, json::dict(_s));
 
             src.key = o.key;
             src.keyfp = o.keyfp;
@@ -635,7 +635,7 @@ fn build_cargo_options(argv: [str]) -> options {
 
 fn configure(opts: options) -> cargo {
     let home = alt get_cargo_root() {
-        ok(home) { home }
+        ok(_home) { _home }
         err(_err) { result::get(get_cargo_sysroot()) }
     };
 
@@ -647,11 +647,11 @@ fn configure(opts: options) -> cargo {
 
     let p = result::get(get_cargo_dir());
 
-    let sources = map::str_hash();
+    let sources = map::str_hash::<source>();
     try_parse_sources(path::connect(home, "sources.json"), sources);
     try_parse_sources(path::connect(home, "local-sources.json"), sources);
 
-    let dep_cache = map::str_hash();
+    let dep_cache = map::str_hash::<bool>();
 
     let mut c = {
         pgp: pgp::supported(),
@@ -668,9 +668,9 @@ fn configure(opts: options) -> cargo {
     };
 
     need_dir(c.root);
-    need_dir(c.installdir);
     need_dir(c.sourcedir);
     need_dir(c.workdir);
+    need_dir(c.installdir);
     need_dir(c.libdir);
     need_dir(c.bindir);
 
@@ -799,7 +799,7 @@ fn install_source(c: cargo, path: str) {
 
                     let wd_base = c.workdir + path::path_sep();
                     let wd = alt tempfile::mkdtemp(wd_base, "") {
-                        some(wd) { wd }
+                        some(_wd) { _wd }
                         none { fail #fmt("needed temp dir: %s", wd_base); }
                     };
 
@@ -819,8 +819,8 @@ fn install_source(c: cargo, path: str) {
 
 fn install_git(c: cargo, wd: str, url: str, ref: option<str>) {
     run::program_output("git", ["clone", url, wd]);
-    if option::is_some(ref) {
-        let r = option::get(ref);
+    if option::is_some::<str>(ref) {
+        let r = option::get::<str>(ref);
         os::change_dir(wd);
         run::run_program("git", ["checkout", r]);
     }
@@ -1021,8 +1021,8 @@ fn cmd_uninstall(c: cargo) {
 
 fn install_query(c: cargo, wd: str, target: str) {
     alt c.dep_cache.find(target) {
-        some(inst) {
-            if inst {
+        some(_inst) {
+            if _inst {
                 ret;
             }
         }
@@ -1082,7 +1082,7 @@ fn install_query(c: cargo, wd: str, target: str) {
 fn cmd_install(c: cargo) unsafe {
     let wd_base = c.workdir + path::path_sep();
     let wd = alt tempfile::mkdtemp(wd_base, "") {
-        some(wd) { wd }
+        some(_wd) { _wd }
         none { fail #fmt("needed temp dir: %s", wd_base); }
     };
 
@@ -1536,7 +1536,7 @@ fn cmd_search(c: cargo) {
 fn install_to_dir(srcfile: str, destdir: str) {
     let newfile = path::connect(destdir, path::basename(srcfile));
 
-    let status = run::run_program("cp", ["-r", srcfile, newfile]);
+    let status = run::run_program("cp", [srcfile, newfile]);
     if status == 0 {
         info(#fmt["installed: '%s'", newfile]);
     } else {

trunk/src/libstd/json.rs

@@ -510,14 +510,6 @@ impl of to_json for json {
     fn to_json() -> json { self }
 }
 
-impl of to_json for @json {
-    fn to_json() -> json { *self }
-}
-
-impl of to_json for int {
-    fn to_json() -> json { num(self as float) }
-}
-
 impl of to_json for i8 {
     fn to_json() -> json { num(self as float) }
 }
@@ -534,10 +526,6 @@ impl of to_json for i64 {
     fn to_json() -> json { num(self as float) }
 }
 
-impl of to_json for uint {
-    fn to_json() -> json { num(self as float) }
-}
-
 impl of to_json for u8 {
     fn to_json() -> json { num(self as float) }
 }

trunk/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2012-06-12 11e30b2
+  macos-x86_64 b6e031112f4619dcd5aa708cf9ea9871a7b11595
+  macos-i386 497875c1fb6289c704485b8bf2e3c40c7918bf4e
+  freebsd-x86_64 8b7efe161706066f3711fcb28a0edc969870851d
+  linux-x86_64 b12a342144309e0053a7654ce95b19666a0a3521
+  linux-i386 75e0916903362fcfd3a306d53d932c7ad3f43f28
+  winnt-i386 470d7ededd8e5dc9ded9317d5cfbc8794fe9c594
+
 S 2012-06-07 3cbd1e2
   macos-x86_64 e899c985a4c7b73e3d597b7139bae9a68f0be3ed
   macos-i386 f002bd36e38dbd6455887da915b449fc22fa3df7