From 7c6e647797fc41412d35396226514ce5f91ca4fc Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 2 Aug 2020 17:59:48 -0400 Subject: [PATCH] Remove PR patch from script-servo This patch adds a significant chunk of time to our longest benchmark, and doesn't add too much value in practice. --- .../script-servo-2/1-pr-26983.patch | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 collector/benchmarks/script-servo-2/1-pr-26983.patch diff --git a/collector/benchmarks/script-servo-2/1-pr-26983.patch b/collector/benchmarks/script-servo-2/1-pr-26983.patch deleted file mode 100644 index 77d9d41e0..000000000 --- a/collector/benchmarks/script-servo-2/1-pr-26983.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs -index 89aeda77ebd3..2c880d49feeb 100644 ---- a/components/script/dom/websocket.rs -+++ b/components/script/dom/websocket.rs -@@ -68,7 +68,7 @@ mod close_code { - pub const TLS_FAILED: u16 = 1015; - } - --pub fn close_the_websocket_connection( -+fn close_the_websocket_connection( - address: Trusted, - task_source: &WebsocketTaskSource, - canceller: &TaskCanceller, -@@ -81,12 +81,10 @@ pub fn close_the_websocket_connection( - code: code, - reason: Some(reason), - }; -- task_source -- .queue_with_canceller(close_task, &canceller) -- .unwrap(); -+ let _ = task_source.queue_with_canceller(close_task, &canceller); - } - --pub fn fail_the_websocket_connection( -+fn fail_the_websocket_connection( - address: Trusted, - task_source: &WebsocketTaskSource, - canceller: &TaskCanceller, -@@ -97,9 +95,7 @@ pub fn fail_the_websocket_connection( - code: Some(close_code::ABNORMAL), - reason: None, - }; -- task_source -- .queue_with_canceller(close_task, &canceller) -- .unwrap(); -+ let _ = task_source.queue_with_canceller(close_task, &canceller); - } - - #[dom_struct] -@@ -221,18 +217,14 @@ impl WebSocket { - address: address.clone(), - protocol_in_use, - }; -- task_source -- .queue_with_canceller(open_thread, &canceller) -- .unwrap(); -+ let _ = task_source.queue_with_canceller(open_thread, &canceller); - }, - WebSocketNetworkEvent::MessageReceived(message) => { - let message_thread = MessageReceivedTask { - address: address.clone(), - message: message, - }; -- task_source -- .queue_with_canceller(message_thread, &canceller) -- .unwrap(); -+ let _ = task_source.queue_with_canceller(message_thread, &canceller); - }, - WebSocketNetworkEvent::Fail => { - fail_the_websocket_connection(address.clone(), &task_source, &canceller);