mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #25806 - jdm:ipc-up, r=Manishearth
Update ipc-channel and crossbeam-channel Depends on https://github.com/servo/webxr/pull/130 and https://github.com/servo/media/pull/333.
This commit is contained in:
commit
c78f0d7449
51 changed files with 294 additions and 255 deletions
|
@ -2566,7 +2566,7 @@ where
|
|||
|
||||
for receiver in receivers {
|
||||
if let Err(e) = receiver.recv() {
|
||||
warn!("Failed to receive exit response from WebGPU ({})", e);
|
||||
warn!("Failed to receive exit response from WebGPU ({:?})", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2589,10 +2589,10 @@ where
|
|||
|
||||
// Receive exit signals from threads.
|
||||
if let Err(e) = core_receiver.recv() {
|
||||
warn!("Exit resource thread failed ({})", e);
|
||||
warn!("Exit resource thread failed ({:?})", e);
|
||||
}
|
||||
if let Err(e) = storage_receiver.recv() {
|
||||
warn!("Exit storage thread failed ({})", e);
|
||||
warn!("Exit storage thread failed ({:?})", e);
|
||||
}
|
||||
|
||||
debug!("Asking compositor to complete shutdown.");
|
||||
|
@ -4867,7 +4867,7 @@ where
|
|||
warn!("Failed to send GetCurrentEpoch ({}).", e);
|
||||
}
|
||||
match epoch_receiver.recv() {
|
||||
Err(e) => warn!("Failed to receive current epoch ({}).", e),
|
||||
Err(e) => warn!("Failed to receive current epoch ({:?}).", e),
|
||||
Ok(layout_thread_epoch) => {
|
||||
if layout_thread_epoch != *compositor_epoch {
|
||||
return ReadyToSave::EpochMismatch;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue