Skip to content

Commit 6f042f1

Browse files
Erick Tryzelaarerickt
authored andcommitted
---
yaml --- r: 38102 b: refs/heads/try c: 2ad41b8 h: refs/heads/master v: v3
1 parent 3e0abce commit 6f042f1

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 82a983de6803c7b1026ba0b553186306e842e427
5+
refs/heads/try: 2ad41b881cb8389cb690c643e41c27f6c34270d5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/dvec.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ priv impl<A> DVec<A> {
110110
self.data = move data;
111111
}
112112
}
113+
114+
#[inline(always)]
115+
fn unwrap(self) -> ~[A] { unwrap(self) }
113116
}
114117

115118
// In theory, most everything should work with any A, but in practice

branches/try/src/libcore/either.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {
142142
}
143143
}
144144

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+
145153
#[test]
146154
fn test_either_left() {
147155
let val = Left(10);

branches/try/src/libcore/mutable.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ impl<T> Data<T> {
7373
op(unsafe{transmute_immut(&mut self.value)})
7474
}
7575
}
76+
77+
#[inline(always)]
78+
fn unwrap(self) -> T { unwrap(self) }
7679
}
7780

7881
#[test]

0 commit comments

Comments
 (0)