---

yaml
---
r: 7987
b: refs/heads/snap-stage3
c: 47c57a1
h: refs/heads/master
i:
  7985: 846b29b
  7983: 7780a1d
v: v3

Author: killerswan

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4e406d7fdd55c6c499eb3af750c64292a88e4d9f
+refs/heads/snap-stage3: 47c57a17dc51ff32594b5759c300b84e380b9f7b
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/cargo/cargo.rs

@@ -573,7 +573,7 @@ fn install_named_specific(c: cargo, wd: str, src: str, name: str) {
     error("Can't find package " + src + "/" + name);
 }
 
-fn cmd_install(c: cargo, argv: [str]) {
+fn cmd_install(c: cargo, argv: [str]) unsafe {
     // cargo install <pkg>
     if vec::len(argv) < 3u {
         cmd_usage();
@@ -596,8 +596,9 @@ fn cmd_install(c: cargo, argv: [str]) {
         let uuid = rest(target, 5u);
         let idx = str::index(uuid, '/' as u8);
         if idx != -1 {
-            let source = str::slice(uuid, 0u, idx as uint);
-            uuid = str::slice(uuid, idx as uint + 1u, str::byte_len(uuid));
+            let source = str::unsafe::slice(uuid, 0u, idx as uint);
+            uuid = str::unsafe::slice(uuid, idx as uint + 1u,
+                                      str::byte_len(uuid));
             install_uuid_specific(c, wd, source, uuid);
         } else {
             install_uuid(c, wd, uuid);
@@ -606,8 +607,9 @@ fn cmd_install(c: cargo, argv: [str]) {
         let name = target;
         let idx = str::index(name, '/' as u8);
         if idx != -1 {
-            let source = str::slice(name, 0u, idx as uint);
-            name = str::slice(name, idx as uint + 1u, str::byte_len(name));
+            let source = str::unsafe::slice(name, 0u, idx as uint);
+            name = str::unsafe::slice(name, idx as uint + 1u,
+                                      str::byte_len(name));
             install_named_specific(c, wd, source, name);
         } else {
             install_named(c, wd, name);

branches/snap-stage3/src/fuzzer/fuzzer.rs

@@ -283,10 +283,10 @@ fn check_variants_T<T: copy>(
     }
 }
 
-fn last_part(filename: str) -> str {
+fn last_part(filename: str) -> str unsafe {
   let ix = str::rindex(filename, 47u8 /* '/' */);
   assert ix >= 0;
-  str::slice(filename, ix as uint + 1u, str::byte_len(filename) - 3u)
+  str::unsafe::slice(filename, ix as uint + 1u, str::byte_len(filename) - 3u)
 }
 
 enum happiness { passed, cleanly_rejected(str), known_bug(str), failed(str), }

branches/snap-stage3/src/libstd/json.rs

@@ -228,17 +228,17 @@ fn from_str_float(s: str) -> (option<json>, str) {
 
 fn from_str_bool(s: str) -> (option<json>, str) {
     if (str::starts_with(s, "true")) {
-        (some(boolean(true)), str::slice(s, 4u, str::byte_len(s)))
+        (some(boolean(true)), str::char_slice(s, 4u, str::char_len(s)))
     } else if (str::starts_with(s, "false")) {
-        (some(boolean(false)), str::slice(s, 5u, str::byte_len(s)))
+        (some(boolean(false)), str::char_slice(s, 5u, str::char_len(s)))
     } else {
         (none, s)
     }
 }
 
 fn from_str_null(s: str) -> (option<json>, str) {
     if (str::starts_with(s, "null")) {
-        (some(null), str::slice(s, 4u, str::byte_len(s)))
+        (some(null), str::char_slice(s, 4u, str::char_len(s)))
     } else {
         (none, s)
     }