File tree Expand file tree Collapse file tree 2 files changed +20
-1
lines changed Expand file tree Collapse file tree 2 files changed +20
-1
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
14
14
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
15
15
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
16
16
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17
- refs/heads/auto: ddd8c156c650347267e4b02938f8efb207cb2150
17
+ refs/heads/auto: eb74f0ccf60a1e8dda1afe9a3be0e8dd4fd96f9f
18
18
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
19
19
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
Original file line number Diff line number Diff line change @@ -60,6 +60,19 @@ impl<A:Clone> Future<A> {
60
60
}
61
61
}
62
62
63
+ impl < A > Future < A > {
64
+ /// Gets the value from this future, forcing evaluation.
65
+ pub fn unwrap ( self ) -> A {
66
+ let mut this = self ;
67
+ this. get_ref ( ) ;
68
+ let state = replace ( & mut this. state , Evaluating ) ;
69
+ match state {
70
+ Forced ( v) => v,
71
+ _ => fail ! ( "Logic error." ) ,
72
+ }
73
+ }
74
+ }
75
+
63
76
impl < A > Future < A > {
64
77
pub fn get_ref < ' a > ( & ' a mut self ) -> & ' a A {
65
78
/*!
@@ -179,6 +192,12 @@ mod test {
179
192
assert_eq!(f.get(), ~" fail");
180
193
}
181
194
195
+ #[test]
196
+ fn test_interface_unwrap() {
197
+ let mut f = from_value(~" fail");
198
+ assert_eq!(f.unwrap(), ~" fail");
199
+ }
200
+
182
201
#[test]
183
202
fn test_get_ref_method() {
184
203
let mut f = from_value(22);
You can’t perform that action at this time.
0 commit comments