---

yaml
---
r: 20685
b: refs/heads/snap-stage3
c: 6d142c5
h: refs/heads/master
i:
  20683: f776787
v: v3

Author: eholk

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 65beca4e01b0e884cb6f245740b79e0ec382d1cd
+refs/heads/snap-stage3: 6d142c5e25e0613fb4981cd7a8436181a1791982
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -127,7 +127,7 @@ fn tagged_docs(d: doc, tg: uint, it: fn(doc) -> bool) {
 fn doc_data(d: doc) -> ~[u8] { vec::slice::<u8>(*d.data, d.start, d.end) }
 
 fn with_doc_data<T>(d: doc, f: fn(x: &[u8]) -> T) -> T {
-    ret f(vec::slice(*d.data, d.start, d.end));
+    ret f(vec::view(*d.data, d.start, d.end));
 }
 
 fn doc_as_str(d: doc) -> ~str { ret str::from_bytes(doc_data(d)); }

branches/snap-stage3/src/rustc/back/rpath.rs

@@ -145,8 +145,7 @@ fn get_relative_to(abs1: path::path, abs2: path::path) -> path::path {
     let mut path = ~[];
     for uint::range(start_idx, len1 - 1u) |_i| { vec::push(path, ~".."); };
 
-    // FIXME (#2880): use view here.
-    vec::push_all(path, vec::slice(split2, start_idx, len2 - 1u));
+    vec::push_all(path, vec::view(split2, start_idx, len2 - 1u));
 
     if vec::is_not_empty(path) {
         ret path::connect_many(path);

branches/snap-stage3/src/rustc/middle/trans/alt.rs

@@ -113,8 +113,7 @@ fn expand_nested_bindings(m: match, col: uint, val: ValueRef) -> match {
             let pats = vec::append(
                 vec::slice(br.pats, 0u, col),
                 vec::append(~[inner],
-                            // FIXME (#2880): use view here.
-                            vec::slice(br.pats, col + 1u, br.pats.len())));
+                            vec::view(br.pats, col + 1u, br.pats.len())));
             vec::push(result,
                       @{pats: pats,
                         bound: vec::append(
@@ -137,10 +136,8 @@ fn enter_match(dm: DefMap, m: match, col: uint, val: ValueRef,
         alt e(br.pats[col]) {
           some(sub) {
             let pats = vec::append(
-                // FIXME (#2880): use view here.
-                vec::append(sub, vec::slice(br.pats, 0u, col)),
-                // FIXME (#2880): use view here.
-                vec::slice(br.pats, col + 1u, br.pats.len()));
+                vec::append(sub, vec::view(br.pats, 0u, col)),
+                vec::view(br.pats, col + 1u, br.pats.len()));
             let self = br.pats[col];
             let bound = alt self.node {
               ast::pat_ident(name, none) if !pat_is_variant(dm, self) {
@@ -429,8 +426,7 @@ fn compile_submatch(bcx: block, m: match, vals: ~[ValueRef],
             } else { m };
 
     let vals_left = vec::append(vec::slice(vals, 0u, col),
-                                // FIXME (#2880): use view here.
-                                vec::slice(vals, col + 1u, vals.len()));
+                                vec::view(vals, col + 1u, vals.len()));
     let ccx = bcx.fcx.ccx;
     let mut pat_id = 0;
     for vec::each(m) |br| {

branches/snap-stage3/src/rustc/middle/trans/common.rs

@@ -314,8 +314,7 @@ fn revoke_clean(cx: block, val: ValueRef) {
         })) |i| {
             info.cleanups =
                 vec::append(vec::slice(info.cleanups, 0u, i),
-                            // FIXME (#2880): use view here.
-                            vec::slice(info.cleanups,
+                            vec::view(info.cleanups,
                                       i + 1u,
                                       info.cleanups.len()));
             scope_clean_changed(info);