---

yaml
---
r: 20791
b: refs/heads/snap-stage3
c: 37d7c9d
h: refs/heads/master
i:
  20789: 270873e
  20787: ab67a98
  20783: 235d1a7
v: v3

Author: erickt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 71927615e0a2cd2d9f96038ba0f403a4d833a2f5
+refs/heads/snap-stage3: 37d7c9d1c3696ef4d6eb6680e3b682dcd033beaf
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/vim/after/syntax/rust.vim

@@ -0,0 +1,26 @@
+if exists('g:no_rust_conceal') || !has('conceal') || &enc != 'utf-8'
+	finish
+endif
+
+" For those who don't want to see `::`...
+if exists('g:rust_conceal_mod_path')
+	syn match rustNiceOperator "::" conceal cchar=ㆍ
+endif
+
+syn match rustLeftArrowHead contained "-" conceal cchar= 
+syn match rustLeftArrowTail contained "<" conceal cchar=⟵
+syn match rustNiceOperator "<-" contains=rustLeftArrowHead,rustLeftArrowTail
+
+syn match rustRightArrowHead contained ">" conceal cchar= 
+syn match rustRightArrowTail contained "-" conceal cchar=⟶
+syn match rustNiceOperator "->" contains=rustRightArrowHead,rustRightArrowTail
+
+syn match rustFatRightArrowHead contained ">" conceal cchar= 
+syn match rustFatRightArrowTail contained "=" conceal cchar=⟹
+syn match rustNiceOperator "=>" contains=rustFatRightArrowHead,rustFatRightArrowTail
+
+syn match rustNiceOperator /\<\@!_\(_*\>\)\@=/ conceal cchar=′
+
+hi link rustNiceOperator Operator
+hi! link Conceal Operator
+setlocal conceallevel=2

branches/snap-stage3/src/etc/vim/syntax/rust.vim

@@ -103,19 +103,6 @@ syn region    rustComment     start="//" skip="\\$" end="$" contains=rustTodo ke
 
 syn keyword   rustTodo        TODO FIXME XXX NB
 
-" For those who don't want to see `::`...
-syn match   rustModPathSep  "::" conceal cchar=ㆍ
-
-syn match rustArrowHead contained ">" conceal cchar= 
-syn match rustArrowTail contained "-" conceal cchar=⟶
-syn match rustArrowFull "->" contains=rustArrowHead,rustArrowTail
-
-syn match rustFatArrowHead contained ">" conceal cchar= 
-syn match rustFatArrowTail contained "=" conceal cchar=⟹
-syn match rustFatArrowFull "=>" contains=rustFatArrowHead,rustFatArrowTail
-
-syn match rustIdentifierPrime /\<\@!_\(_*\>\)\@=/ conceal cchar=′
-
 hi def link rustHexNumber       rustNumber
 hi def link rustBinNumber       rustNumber
 hi def link rustIdentifierPrime rustIdentifier
@@ -136,7 +123,7 @@ hi def link rustMacro         Macro
 hi def link rustType          Type
 hi def link rustTodo          Todo
 hi def link rustAttribute     PreProc
-hi def link rustModPathSep    Conceal
+
 " Other Suggestions:
 " hi rustAssert ctermfg=yellow
 " hi rustMacro ctermfg=magenta

branches/snap-stage3/src/libcore/vec.rs

@@ -189,7 +189,7 @@ pure fn from_fn<T>(n_elts: uint, op: init_op<T>) -> ~[T] {
     let mut v = ~[];
     unchecked{reserve(v, n_elts);}
     let mut i: uint = 0u;
-    while i < n_elts unsafe { unsafe::set(v, i, op(i)); i += 1u; }
+    while i < n_elts unsafe { ref_set(v, i, op(i)); i += 1u; }
     unsafe { unsafe::set_len(v, n_elts); }
     ret v;
 }
@@ -204,8 +204,8 @@ pure fn from_elem<T: copy>(n_elts: uint, t: T) -> ~[T] {
     let mut v = ~[];
     unchecked{reserve(v, n_elts)}
     let mut i: uint = 0u;
-    unsafe { // because unsafe::set is unsafe
-        while i < n_elts { unsafe::set(v, i, t); i += 1u; }
+    unsafe { // because ref_set is unsafe
+        while i < n_elts { ref_set(v, i, t); i += 1u; }
         unsafe { unsafe::set_len(v, n_elts); }
     }
     ret v;
@@ -534,12 +534,28 @@ fn push_slow<T>(&v: ~[const T], +initval: T) {
     unsafe { push_fast(v, initval) }
 }
 
+// Unchecked vector indexing
+#[inline(always)]
+unsafe fn get_ref<T: copy>(v: &[const T], i: uint) -> T {
+    as_buf(v, |p, _len| *ptr::offset(p, i))
+}
+
+#[inline(always)]
+unsafe fn ref_set<T>(v: &[mut T], i: uint, +val: T) {
+    let mut box = some(val);
+    do as_mut_buf(v) |p, _len| {
+        let mut box2 = none;
+        box2 <-> box;
+        rusti::move_val_init(*ptr::mut_offset(p, i), option::unwrap(box2));
+    }
+}
+
 #[inline(always)]
 fn push_all<T: copy>(&v: ~[const T], rhs: &[const T]) {
     reserve(v, v.len() + rhs.len());
 
     for uint::range(0u, rhs.len()) |i| {
-        push(v, unsafe { unsafe::get(rhs, i) })
+        push(v, unsafe { get_ref(rhs, i) })
     }
 }
 
@@ -1595,28 +1611,6 @@ mod unsafe {
         f(*v)
     }
 
-    /**
-     * Unchecked vector indexing.
-     */
-    #[inline(always)]
-    unsafe fn get<T: copy>(v: &[const T], i: uint) -> T {
-        as_buf(v, |p, _len| *ptr::offset(p, i))
-    }
-
-    /**
-     * Unchecked vector index assignment.
-     */
-    #[inline(always)]
-    unsafe fn set<T>(v: &[mut T], i: uint, +val: T) {
-        let mut box = some(val);
-        do as_mut_buf(v) |p, _len| {
-            let mut box2 = none;
-            box2 <-> box;
-            rusti::move_val_init(*ptr::mut_offset(p, i),
-                                 option::unwrap(box2));
-        }
-    }
-
     /**
       * Copies data from one vector to another.
       *