Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27368 - jdm:wack-fix, r=Manishearth

Browse source 
Use backtrace fork with UWP-specific fix.

Fixes #27367, which was introduced by 57f4f0a09f. I'd like to do a new release in the store, and I would prefer not to wait for a new version of backtrace to be released before that can happen.
This commit is contained in:
bors-servo 2020-07-22 18:31:55 -04:00 • committed by GitHub
commit 5f31dbf993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.lock generated
View file

@ -242,8 +242,7 @@ dependencies = [
[[package]]
name = "backtrace"
version = "0.3.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
source = "git+https://github.com/servo/backtrace-rs?branch=uwp-fix#5366f72ca5be2e2341f418923a71b70acbb653ad"
dependencies = [
"addr2line",
"cfg-if",

3
Cargo.toml
View file

@ -29,6 +29,9 @@ opt-level = 3
# This is here to dedupe winapi since mio 0.6 is still using winapi 0.2.
mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" }
# https://github.com/rust-lang/backtrace-rs/pull/363/
backtrace = { git = "https://github.com/servo/backtrace-rs", branch = "uwp-fix" }
# https://github.com/servo/servo/issues/27039#issuecomment-654400150
[patch."https://github.com/servo/webrender"]
webrender = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }