Skip to content

Commit 61b680b

Browse files
committed
Attempt to fix backtrace tests on i686-msvc
Some fixes for i686-msvc and Windows have landed on the `backtrace` crate but hadn't made their way here yet. Let's update that and see if it passes CI.
1 parent 3ebca72 commit 61b680b

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

Cargo.lock

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,12 @@ dependencies = [
9797
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
9898
]
9999

100-
[[package]]
101-
name = "autocfg"
102-
version = "0.1.4"
103-
source = "registry+https://github.com/rust-lang/crates.io-index"
104-
105100
[[package]]
106101
name = "backtrace"
107-
version = "0.3.29"
102+
version = "0.3.33"
108103
source = "registry+https://github.com/rust-lang/crates.io-index"
109104
dependencies = [
110-
"autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
111-
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
105+
"backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
112106
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
113107
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
114108
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -118,7 +112,7 @@ dependencies = [
118112

119113
[[package]]
120114
name = "backtrace-sys"
121-
version = "0.1.27"
115+
version = "0.1.30"
122116
source = "registry+https://github.com/rust-lang/crates.io-index"
123117
dependencies = [
124118
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -868,7 +862,7 @@ name = "error-chain"
868862
version = "0.12.0"
869863
source = "registry+https://github.com/rust-lang/crates.io-index"
870864
dependencies = [
871-
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
865+
"backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
872866
]
873867

874868
[[package]]
@@ -883,7 +877,7 @@ name = "failure"
883877
version = "0.1.5"
884878
source = "registry+https://github.com/rust-lang/crates.io-index"
885879
dependencies = [
886-
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
880+
"backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
887881
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
888882
]
889883

@@ -2513,7 +2507,7 @@ name = "rustc"
25132507
version = "0.0.0"
25142508
dependencies = [
25152509
"arena 0.0.0",
2516-
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
2510+
"backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
25172511
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
25182512
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
25192513
"chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3491,7 +3485,7 @@ name = "std"
34913485
version = "0.0.0"
34923486
dependencies = [
34933487
"alloc 0.0.0",
3494-
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
3488+
"backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
34953489
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
34963490
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
34973491
"compiler_builtins 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4308,9 +4302,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43084302
"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
43094303
"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"
43104304
"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
4311-
"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
4312-
"checksum backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)" = "2d631cd7af21b7ff796293f1990104e3cdb606852863bac32f000c193aa35dfb"
4313-
"checksum backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea90dd7b012b3d1a2cb6bec16670a0db2c95d4e931e84f4047e0460c1b34c8d"
4305+
"checksum backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "88fb679bc9af8fa639198790a77f52d345fe13656c08b43afa9424c206b731c6"
4306+
"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61"
43144307
"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
43154308
"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
43164309
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"

src/test/run-pass/backtrace-debuginfo.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// ignore-pretty issue #37195
1111
// ignore-cloudabi spawning processes is not supported
1212
// ignore-emscripten spawning processes is not supported
13-
// ignore-msvc issue #62844
1413
// ignore-sgx no processes
1514
// normalize-stderr-test ".*\n" -> ""
1615

src/test/run-pass/backtrace.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// ignore-cloudabi spawning processes is not supported
33
// ignore-emscripten spawning processes is not supported
44
// ignore-openbsd no support for libbacktrace without filename
5-
// ignore-msvc issue #62844
65
// ignore-sgx no processes
76
// compile-flags:-g
87

0 commit comments

Comments
 (0)