---

Erick Tryzelaar · erickt · commit 0b02fdbb66ab · 2012-12-18T20:54:13.000-08:00
yaml --- r: 36821 b: refs/heads/try2 c: 2ad41b8 h: refs/heads/master i: 36819: ec8f148 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 82a983de6803c7b1026ba0b553186306e842e427
+refs/heads/try2: 2ad41b881cb8389cb690c643e41c27f6c34270d5
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libcore/dvec.rs b/branches/try2/src/libcore/dvec.rs
@@ -110,6 +110,9 @@ priv impl<A> DVec<A> {
             self.data = move data;
         }
     }
+
+    #[inline(always)]
+    fn unwrap(self) -> ~[A] { unwrap(self) }
 }
 
 // In theory, most everything should work with any A, but in practice
diff --git a/branches/try2/src/libcore/either.rs b/branches/try2/src/libcore/either.rs
@@ -142,6 +142,14 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {
     }
 }
 
+impl<T, U> Either<T, U> {
+    #[inline(always)]
+    fn unwrap_left(self) -> T { unwrap_left(self) }
+
+    #[inline(always)]
+    fn unwrap_right(self) -> U { unwrap_right(self) }
+}
+
 #[test]
 fn test_either_left() {
     let val = Left(10);
diff --git a/branches/try2/src/libcore/mutable.rs b/branches/try2/src/libcore/mutable.rs
@@ -73,6 +73,9 @@ impl<T> Data<T> {
             op(unsafe{transmute_immut(&mut self.value)})
         }
     }
+
+    #[inline(always)]
+    fn unwrap(self) -> T { unwrap(self) }
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ priv impl<A> DVec<A> {`
`110`	`110`	`self.data = move data;`
`111`	`111`	`}`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+ #[inline(always)]`
	`115`	`+ fn unwrap(self) -> ~[A] { unwrap(self) }`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`// In theory, most everything should work with any A, but in practice`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,14 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
	`145`	`+impl<T, U> Either<T, U> {`
	`146`	`+ #[inline(always)]`
	`147`	`+ fn unwrap_left(self) -> T { unwrap_left(self) }`
	`148`	`+`
	`149`	`+ #[inline(always)]`
	`150`	`+ fn unwrap_right(self) -> U { unwrap_right(self) }`
	`151`	`+}`
	`152`	`+`
`145`	`153`	`#[test]`
`146`	`154`	`fn test_either_left() {`
`147`	`155`	`let val = Left(10);`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ impl<T> Data<T> {`
`73`	`73`	`op(unsafe{transmute_immut(&mut self.value)})`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ #[inline(always)]`
	`78`	`+ fn unwrap(self) -> T { unwrap(self) }`
`76`	`79`	`}`
`77`	`80`
`78`	`81`	`#[test]`