actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-07-01 12:15:08 +02:00
Code Issues Releases Wiki Activity

remove unsafe cell from ws client

Browse Source
This commit is contained in:
Nikolay Kim
2018-06-19 09:36:17 +06:00
parent 261ad31b9a
commit 362b14c2f7
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ws/client.rs
View File

@ -1,5 +1,5 @@
//! Http client request
use std::cell::UnsafeCell;
use std::cell::RefCell;
use std::rc::Rc;
use std::time::Duration;
use std::{fmt, io, str};
@ -422,7 +422,7 @@ impl Future for ClientHandshake {
closed: false,
};
let inner = Rc::new(UnsafeCell::new(inner));
let inner = Rc::new(RefCell::new(inner));
Ok(Async::Ready((
ClientReader {
inner: Rc::clone(&inner),
@ -435,7 +435,7 @@ impl Future for ClientHandshake {
/// Websocket reader client
pub struct ClientReader {
inner: Rc<UnsafeCell<Inner>>,
inner: Rc<RefCell<Inner>>,
max_size: usize,
}
@ -451,7 +451,7 @@ impl Stream for ClientReader {
fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
let max_size = self.max_size;
let inner: &mut Inner = unsafe { &mut *self.inner.get() };
let mut inner = self.inner.borrow_mut();
if inner.closed {
return Ok(Async::Ready(None));
}
@ -507,14 +507,14 @@ impl Stream for ClientReader {
/// Websocket writer client
pub struct ClientWriter {
inner: Rc<UnsafeCell<Inner>>,
inner: Rc<RefCell<Inner>>,
}
impl ClientWriter {
/// Write payload
#[inline]
fn write(&mut self, mut data: Binary) {
let inner: &mut Inner = unsafe { &mut *self.inner.get() };
let inner = self.inner.borrow_mut();
if !inner.closed {
let _ = inner.tx.unbounded_send(data.take());
} else {