diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-03-18 23:38:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-18 23:38:17 -0400 |
commit | 2b0a48f291bf6968ce9d13822fd242d46f4f0412 (patch) | |
tree | 094e373e9786c3b39d707f8de441c775f7bb6601 /components/canvas/canvas_data.rs | |
parent | 0fef1bfbecd562116784958ba512ab6cd9898732 (diff) | |
parent | 9f892eb2c2208026098e672633ed77990db21e42 (diff) | |
download | servo-2b0a48f291bf6968ce9d13822fd242d46f4f0412.tar.gz servo-2b0a48f291bf6968ce9d13822fd242d46f4f0412.zip |
Auto merge of #25983 - vbkaisetsu:fix/come-back-21532, r=jdm
Update x11-dl to pickup the fix for x11 startup crash (recurrence of #21530)
This branch updates x11-dl to 2.18.5 to get erlepereira/x11-rs#99
```
% ./mach run --release https://duckduckgo.com
attempted to leave type `std::mem::ManuallyDrop<xlib_xcb::Xlib_xcb>` uninitialized, which is invalid (thread main, at /rustc/45ebd5808afd3df7ba842797c0fcd4447ddf30fb/src/libcore/mem/mod.rs:536)
stack backtrace:
0: servo::backtrace::print
1: servo::main::{{closure}}
2: std::panicking::rust_panic_with_hook
at src/libstd/panicking.rs:513
3: rust_begin_unwind
at src/libstd/panicking.rs:417
4: core::panicking::panic_fmt
at src/libcore/panicking.rs:111
5: core::panicking::panic
at src/libcore/panicking.rs:54
6: x11_dl::xlib_xcb::Xlib_xcb::open
7: winit::platform::platform::x11::xdisplay::XConnection::new
8: std::sync::once::Once::call_once::{{closure}}
9: std::sync::once::Once::call_inner
at src/libstd/sync/once.rs:416
10: winit::platform::platform::EventsLoop::new_x11
11: winit::platform::platform::EventsLoop::new
12: winit::EventsLoop::new
13: servo::events_loop::EventsLoop::new
14: servo::app::App::run
15: servo::main
16: std::rt::lang_start::{{closure}}
17: std::rt::lang_start_internal::{{closure}}
at src/libstd/rt.rs:52
std::panicking::try::do_call
at src/libstd/panicking.rs:329
std::panicking::try::do_try
at src/libstd/panicking.rs:285
std::panicking::try
at src/libstd/panicking.rs:274
std::panic::catch_unwind
at src/libstd/panic.rs:394
std::rt::lang_start_internal
at src/libstd/rt.rs:51
18: main
19: __libc_start_main
20: _start
Servo exited with return value 101
```
This patch is created by `cargo update -p x11-dl`.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it fixes a startup crash
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/canvas/canvas_data.rs')
0 files changed, 0 insertions, 0 deletions