about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorBen Striegel <ben.striegel@gmail.com>2013-01-29 22:41:04 -0500
committerBen Striegel <ben.striegel@gmail.com>2013-01-30 23:20:32 -0500
commitcc3bb7b68a2e7e43b244a00c4ff96d14b74de251 (patch)
tree39b61b39304a7d81df19bb6f184e07f37fd5504e /src/libcore
parent743c1c37e87835cbc7e9a5b5daff7ff9f71e9fe6 (diff)
What, no syntax for mutable borrowed region pointers?
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/vec.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 52b62d10a20..7e8dcf72d0f 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -280,12 +280,8 @@ pub pure fn view<T>(v: &r/[T], start: uint, end: uint) -> &r/[T] {
 }
 
 /// Return a slice that points into another slice.
-<<<<<<< HEAD
 #[inline(always)]
 pub pure fn mut_view<T>(v: &r/[mut T], start: uint, end: uint) -> &r/[mut T] {
-=======
-pub pure fn mut_view<T>(v: &mut r/[T], start: uint, end: uint) -> &mut r/[T] {
->>>>>>> RIMOV, round 11
     assert (start <= end);
     assert (end <= len(v));
     do as_mut_buf(v) |p, _len| {