mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Upgrade tungstenite, webpki-roots, and hyper-rustls dependencies. (#37333)
This change upgrades some dependencies that required some manual intervention due to duplicate packages and breaking API changes. These changes also allow us to upgrade to ipc-channel 0.20 (https://github.com/servo/ipc-channel/pull/390#discussion_r2070677101), and allow us to upgrade other dependencies that have migrated to rand 0.9 while the ecosystem remains split. Testing: Existing WPT tests. Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
parent
63cfeb3a18
commit
96b0973037
4 changed files with 130 additions and 47 deletions
|
@ -169,12 +169,12 @@ fn setup_dom_listener(
|
|||
trace!("handling WS DOM action: {:?}", dom_action);
|
||||
match dom_action {
|
||||
WebSocketDomAction::SendMessage(MessageData::Text(data)) => {
|
||||
if let Err(e) = sender.send(DomMsg::Send(Message::Text(data))) {
|
||||
if let Err(e) = sender.send(DomMsg::Send(Message::Text(data.into()))) {
|
||||
warn!("Error sending websocket message: {:?}", e);
|
||||
}
|
||||
},
|
||||
WebSocketDomAction::SendMessage(MessageData::Binary(data)) => {
|
||||
if let Err(e) = sender.send(DomMsg::Send(Message::Binary(data))) {
|
||||
if let Err(e) = sender.send(DomMsg::Send(Message::Binary(data.into()))) {
|
||||
warn!("Error sending websocket message: {:?}", e);
|
||||
}
|
||||
},
|
||||
|
@ -246,7 +246,7 @@ async fn run_ws_loop(
|
|||
};
|
||||
match msg {
|
||||
Message::Text(s) => {
|
||||
let message = MessageData::Text(s);
|
||||
let message = MessageData::Text(s.as_str().to_owned());
|
||||
if let Err(e) = resource_event_sender
|
||||
.send(WebSocketNetworkEvent::MessageReceived(message))
|
||||
{
|
||||
|
@ -256,7 +256,7 @@ async fn run_ws_loop(
|
|||
}
|
||||
|
||||
Message::Binary(v) => {
|
||||
let message = MessageData::Binary(v);
|
||||
let message = MessageData::Binary(v.to_vec());
|
||||
if let Err(e) = resource_event_sender
|
||||
.send(WebSocketNetworkEvent::MessageReceived(message))
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue