File tree Expand file tree Collapse file tree 1 file changed +27
-1
lines changed Expand file tree Collapse file tree 1 file changed +27
-1
lines changed Original file line number Diff line number Diff line change @@ -132,7 +132,8 @@ impl<A:Send> Future<A> {
132132 let ( tx, rx) = channel ( ) ;
133133
134134 spawn ( proc ( ) {
135- tx. send ( blk ( ) ) ;
135+ // Don't fail if the other end has hung up
136+ let _ = tx. send_opt ( blk ( ) ) ;
136137 } ) ;
137138
138139 Future :: from_receiver ( rx)
@@ -144,6 +145,7 @@ mod test {
144145 use prelude:: * ;
145146 use sync:: Future ;
146147 use task;
148+ use comm:: { channel, Sender } ;
147149
148150 #[ test]
149151 fn test_from_value ( ) {
@@ -206,4 +208,28 @@ mod test {
206208 assert_eq ! ( actual, expected) ;
207209 } ) ;
208210 }
211+
212+ #[ test]
213+ fn test_dropped_future_doesnt_fail ( ) {
214+ struct Bomb ( Sender < bool > ) ;
215+
216+ local_data_key ! ( LOCAL : Bomb )
217+
218+ impl Drop for Bomb {
219+ fn drop ( & mut self ) {
220+ let Bomb ( ref tx) = * self ;
221+ tx. send ( task:: failing ( ) ) ;
222+ }
223+ }
224+
225+ // Spawn a future, but drop it immediately. When we receive the result
226+ // later on, we should never view the task as having failed.
227+ let ( tx, rx) = channel ( ) ;
228+ drop ( Future :: spawn ( proc ( ) {
229+ LOCAL . replace ( Some ( Bomb ( tx) ) ) ;
230+ } ) ) ;
231+
232+ // Make sure the future didn't fail the task.
233+ assert ! ( !rx. recv( ) ) ;
234+ }
209235}
You can’t perform that action at this time.
0 commit comments