From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 20:31:44 +0200 Subject: Merging upstream version 1.74.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/backtrace/.cargo-checksum.json | 2 +- vendor/backtrace/Cargo.lock | 68 +++++++++--------- vendor/backtrace/Cargo.toml | 51 +++++++------- vendor/backtrace/build.rs | 12 +++- vendor/backtrace/ci/android-ndk.sh | 14 ---- vendor/backtrace/ci/android-sdk.sh | 65 ----------------- vendor/backtrace/ci/debuglink-docker.sh | 29 -------- vendor/backtrace/ci/debuglink.sh | 75 -------------------- .../ci/docker/aarch64-linux-android/Dockerfile | 18 ----- .../ci/docker/aarch64-unknown-linux-gnu/Dockerfile | 11 --- .../ci/docker/arm-linux-androideabi/Dockerfile | 18 ----- .../docker/arm-unknown-linux-gnueabihf/Dockerfile | 10 --- .../ci/docker/armv7-linux-androideabi/Dockerfile | 18 ----- .../armv7-unknown-linux-gnueabihf/Dockerfile | 10 --- .../ci/docker/i586-unknown-linux-gnu/Dockerfile | 5 -- .../ci/docker/i686-linux-android/Dockerfile | 18 ----- .../ci/docker/i686-unknown-linux-gnu/Dockerfile | 5 -- .../docker/powerpc64-unknown-linux-gnu/Dockerfile | 16 ----- .../ci/docker/s390x-unknown-linux-gnu/Dockerfile | 17 ----- .../ci/docker/x86_64-linux-android/Dockerfile | 18 ----- .../ci/docker/x86_64-pc-windows-gnu/Dockerfile | 10 --- .../ci/docker/x86_64-unknown-linux-gnu/Dockerfile | 6 -- .../ci/docker/x86_64-unknown-linux-musl/Dockerfile | 6 -- vendor/backtrace/ci/run-docker.sh | 33 --------- vendor/backtrace/ci/run.sh | 6 -- vendor/backtrace/ci/runtest-android.rs | 50 ------------- vendor/backtrace/src/print.rs | 3 +- vendor/backtrace/src/print/fuchsia.rs | 7 +- .../symbolize/gimli/parse_running_mmaps_unix.rs | 81 +++++++++++++++++++--- vendor/backtrace/src/symbolize/mod.rs | 2 +- vendor/backtrace/src/windows.rs | 4 +- 31 files changed, 154 insertions(+), 534 deletions(-) delete mode 100755 vendor/backtrace/ci/android-ndk.sh delete mode 100755 vendor/backtrace/ci/android-sdk.sh delete mode 100755 vendor/backtrace/ci/debuglink-docker.sh delete mode 100755 vendor/backtrace/ci/debuglink.sh delete mode 100644 vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i686-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile delete mode 100755 vendor/backtrace/ci/run-docker.sh delete mode 100755 vendor/backtrace/ci/run.sh delete mode 100644 vendor/backtrace/ci/runtest-android.rs (limited to 'vendor/backtrace') diff --git a/vendor/backtrace/.cargo-checksum.json b/vendor/backtrace/.cargo-checksum.json index 00ff1627f..437f38752 100644 --- a/vendor/backtrace/.cargo-checksum.json +++ b/vendor/backtrace/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.lock":"f31feb9df764e7218aedb67711229342357ec7d5f42d864483a8a922803ffcab","Cargo.toml":"9027cbc60eb972c10a49815c896ebf4e47299ec4ee739e5eed5eb9ac3832ed11","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6007ea91612793f8c77d499d2065acd2255fc5f3c3268fd8bd1ae5f7bb40d6de","benches/benchmarks.rs":"029b78bb79052ec940eecfd18067b743925189202fc16015d3c4c25b05eb6d67","build.rs":"8d5e860da109f86c67596b10b5613ff6d19f9d24c2970f491a55261fb1973692","ci/android-ndk.sh":"66a384ed28980c3fdf42e773925938d56f045c27fa34487525a6d41bc5ef6d56","ci/android-sdk.sh":"69a953f70f32064d1d2a57c7082a50336b90a12d10c75e5416dbb1d6d718016c","ci/debuglink-docker.sh":"3a16131df8c69fef37331cb6f01a6623d169177474f475159d05bab61df077a9","ci/debuglink.sh":"164a961b930de8c9aedf45a11076c3d41081846a8e6a9566ba2b6ad615179e0b","ci/docker/aarch64-linux-android/Dockerfile":"e9736941e1de9664dca7055898b74bd7148a455b3d3c208c97b2fae2a060fd27","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"a7b7aae0d8e2f826cf1c6c7c3160f8e5e9a30478b83c394b6575ce15b0ff0802","ci/docker/arm-linux-androideabi/Dockerfile":"435a6b1c68a3e33503e01e382eb4c0d69907d15ffe4e2d466307b4643afb1a72","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"5156382ff639b11801c1bd7ddc6e03e8834505a74ecf7160e92182603cd5d96f","ci/docker/armv7-linux-androideabi/Dockerfile":"4a779ddce215f7552a5bb77a10587b9a3cc03ef94434546b6ac2da458d598b19","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"4aaceef14ba700ea3719fe30fcb46f1bb154a47aa52cdb64fa6ed7eff96d6c85","ci/docker/i586-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/i686-linux-android/Dockerfile":"08bfb5d56443fc03f513a631a1ae2a1d9665338c25d3c3e4f021533a2805a336","ci/docker/i686-unknown-linux-gnu/Dockerfile":"0816c89b79a74be7ccfc34e95cd718ce29a8698a2ab56903b4b0712470f5c8bb","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"270de99179c925e6284a8283fdb4e40a8c813a569b24930d6cfe79a4c470ab61","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"4aa8ca641efd2f1937ef669eda2f3e357b2fb926911722b3afc6cf25ce4bcac2","ci/docker/x86_64-linux-android/Dockerfile":"0a6e8f5adc84d4d426104fbf0606fd6aabfb7550fc105d62539a8516d631e8ad","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"654988c5c008610f90d5159a8dd0ab6fd491e9c0d16ad65b03ef53f694a5400c","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"9f89f080551fff6678b1efcc0925fc8c16316f69cdd150e89f9e95cdab583510","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"4db3cb7d315588f363eb9f377bf1c27d8e8886c07b6c0d0c5cf7ee91114a718b","ci/run-docker.sh":"70760696a608b0d89eb3dcc4b08f176d709dd9f98e50297f2b7e0bb9b0f3b458","ci/run.sh":"0bb5c8256019779f3e1db20fcc2c01416ffd4679428f3e395ef5f3e55d2d642c","ci/runtest-android.rs":"be2e49bb296b92a8e3643a6c0a70917fe7b130fa43b71a29c4e7514f45c00e7e","examples/backtrace.rs":"5da0c95ccebfaffbbe7b5a92b0e488017dc375cbb5b8fb2b7712dd65b2dfb2ba","examples/raw.rs":"575ec6037f597ba7ab0eaf9dd699fadfabef918ba2affea7dc20cdbde55de5ec","src/android-api.c":"b75f16de578451464f49b83dc817b76aa9a0be0d86ea71d1659cc78f99e94fbd","src/backtrace/dbghelp.rs":"ea2f175d6c62259d86e7e9bb04328e03657d7259d4459aab70734f1cf1cd9d72","src/backtrace/libunwind.rs":"0034180e37da7b155cfe87136f07aecf6e67d51848a2db9689b19cf757bd30ee","src/backtrace/miri.rs":"c0dcb1e430eea92fcbad3e293124010f39c1f8ff1bbbf1a0275c53b05880cd5f","src/backtrace/mod.rs":"c782a02a0f9abd1eab79b1271cb6b793102a3c5b516b5dac2977ec634e158bfc","src/backtrace/noop.rs":"a8550b70b3c83f6852a1dba83cf97b1325238b5aa3ce7b35437e9382cdafd924","src/capture.rs":"8701657803f04ea9e0b9dd6a4ca619761edb8a42cfd2f7c9c9e4ee31d9357159","src/dbghelp.rs":"eae2d15fdf7a894ff4c0641f801b687337c07640a80b3a60f2b66013195ca7b4","src/lib.rs":"897d98f5db9ba97802b853b2aaab79645808c0570e840e22c661bae43ba7f111","src/print.rs":"c158bb0c995b3048482e4caebbf7afaa1361300ee8a4d48e50cfb47a9e09a117","src/print/fuchsia.rs":"cd760acf0c5b5f866ef9dbc83ef8895d8d459ad5146afd79f89be453d8bdcad4","src/symbolize/dbghelp.rs":"58aeda764a27702e0abb3af62bae8a162d8b6cb8c80ffd141ee794d81a8ace15","src/symbolize/gimli.rs":"4f93f6d6652a518ca4c4866fdefb928aa8cf7f547cbdffe0eec081760d1a2507","src/symbolize/gimli/coff.rs":"1a6d69aeb9c79d1acdeb054c1af050251c774d1328ef1a964d08f01c27f2bd2f","src/symbolize/gimli/elf.rs":"0b11415c75302bd4f70abf5147e83595fba38fcd54344170aedce1cb70049807","src/symbolize/gimli/libs_dl_iterate_phdr.rs":"bc64242857dd82288d6e7d6b183e651d05ab7bc4f037f19b9e42719f04fc2c83","src/symbolize/gimli/libs_haiku.rs":"0a0d4b37145e898f7068cadacccf362d8216e463e7026af2ce38d75ebfd74bea","src/symbolize/gimli/libs_illumos.rs":"523e96272b46bdaab2abb0dd0201cb8032bf86558cbed986a20d7e2cc02fa8be","src/symbolize/gimli/libs_libnx.rs":"4116eceadb2d9916d4f5602712eacec647f185d4c53c723aced8de5fc471b14d","src/symbolize/gimli/libs_macos.rs":"c24cb480ae029b350325873ac4358104e5943ad61b62eb22bb6b65b2f05bbd29","src/symbolize/gimli/libs_windows.rs":"6459f8610ca1a0fd7456539ec604f5276c94b3d0d7331357eaed338e49220a02","src/symbolize/gimli/macho.rs":"3cb44a7ff72d0b8c619463c2346f2cfdc378996bb523ceb0c5ab22b1443035b6","src/symbolize/gimli/mmap_fake.rs":"9564fcf47000e70d521b31518e205c8e6ee09b7410fb1eb1e452721757ff54ba","src/symbolize/gimli/mmap_unix.rs":"7d3d7bc6e5d34e3ecb1fe8b30d36bed404b4b9cd79d3b771c91215abfabb9ad1","src/symbolize/gimli/mmap_windows.rs":"a80bada1cef7e2ba1cff7b211eaa53b816248a7c89713c8cc6a70996f727efe4","src/symbolize/gimli/parse_running_mmaps_unix.rs":"0b343cf9ceacd57661b7d86cf5e1df7cc65559f5f684b85fa92014cd6214802d","src/symbolize/gimli/stash.rs":"69153136df5cb9bf955430c0a2f43c6131834cb7846631f39b58c074496a6ef0","src/symbolize/miri.rs":"f5201cc8a7de24ad3424d2472cb0af59cd28563d09cc0c21e998f4cee4367ade","src/symbolize/mod.rs":"a7177603810aca1cd9cd4a59027a1dd2c792dc9d345435b5dc866eb7c8b66baf","src/symbolize/noop.rs":"5d4432079b8ae2b9382945a57ae43df57bb4b7ed2e5956d4167e051a44567388","src/types.rs":"f43c94b99d57ca66a5cfe939a46016c95b2d69d82695fb52480f7a3e5b344fd9","src/windows.rs":"b0bbbf4088021fd646024ad01de1a60bf12bf62b6b744f0f5952681f77cd49e6","tests/accuracy/auxiliary.rs":"71d2238da401042e007ef5ee20336d6834724bae96d93c8c52d11a5a332d7d34","tests/accuracy/main.rs":"f8e42aeeb50b35fca380db2e9fe52820cc0bc3133167289c5710e3290701e78e","tests/common/mod.rs":"733101288a48cf94d5a87a1957724deaf2650c3e4e8aa0190a4a7db62aa90d01","tests/concurrent-panics.rs":"b60279ad5c4fb9b2754807f35179cbc8fbd7acbe6e92ac6d0f416ae75db38705","tests/current-exe-mismatch.rs":"540523069f005a9a0822497c6e1c5b7f0df442f0cef6b6e411d6f600bcd0be15","tests/long_fn_name.rs":"ebef58e34543ed4d47048faa9b6525f68fc71e12255af734523a513c5d4baa6f","tests/skip_inner_frames.rs":"6c03cd0ad9facf0aa81e59cf970504785b6ada9993a2dfc2aea0b18b79419aeb","tests/smoke.rs":"33014495f9158aea2d0ee2ee3335ffe82105c7ed894f96eaf7d23845a60f7439"},"package":"4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"} \ No newline at end of file +{"files":{"Cargo.lock":"d2dfb97c75e40290ddadf7f5f11eb154d0398088acdb893afeef0ce8f9be5929","Cargo.toml":"b509b390f54dbe9df8e5572dcc27a2f828686b35aab1c83a2dd88640c515bd9c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6007ea91612793f8c77d499d2065acd2255fc5f3c3268fd8bd1ae5f7bb40d6de","benches/benchmarks.rs":"029b78bb79052ec940eecfd18067b743925189202fc16015d3c4c25b05eb6d67","build.rs":"0e30892bba823f9a1143d6d15995951b65a25f917af5443ba96cc8323bddb67f","examples/backtrace.rs":"5da0c95ccebfaffbbe7b5a92b0e488017dc375cbb5b8fb2b7712dd65b2dfb2ba","examples/raw.rs":"575ec6037f597ba7ab0eaf9dd699fadfabef918ba2affea7dc20cdbde55de5ec","src/android-api.c":"b75f16de578451464f49b83dc817b76aa9a0be0d86ea71d1659cc78f99e94fbd","src/backtrace/dbghelp.rs":"ea2f175d6c62259d86e7e9bb04328e03657d7259d4459aab70734f1cf1cd9d72","src/backtrace/libunwind.rs":"0034180e37da7b155cfe87136f07aecf6e67d51848a2db9689b19cf757bd30ee","src/backtrace/miri.rs":"c0dcb1e430eea92fcbad3e293124010f39c1f8ff1bbbf1a0275c53b05880cd5f","src/backtrace/mod.rs":"c782a02a0f9abd1eab79b1271cb6b793102a3c5b516b5dac2977ec634e158bfc","src/backtrace/noop.rs":"a8550b70b3c83f6852a1dba83cf97b1325238b5aa3ce7b35437e9382cdafd924","src/capture.rs":"8701657803f04ea9e0b9dd6a4ca619761edb8a42cfd2f7c9c9e4ee31d9357159","src/dbghelp.rs":"eae2d15fdf7a894ff4c0641f801b687337c07640a80b3a60f2b66013195ca7b4","src/lib.rs":"897d98f5db9ba97802b853b2aaab79645808c0570e840e22c661bae43ba7f111","src/print.rs":"a550d6c11e70ff8e5d0ff6d6034db0e33567f29d8ac7596459af67abef9e6300","src/print/fuchsia.rs":"2c04b3125edf93b47c07489646f5fffa3f7614f7925d0a95886ac0c81368a945","src/symbolize/dbghelp.rs":"58aeda764a27702e0abb3af62bae8a162d8b6cb8c80ffd141ee794d81a8ace15","src/symbolize/gimli.rs":"4f93f6d6652a518ca4c4866fdefb928aa8cf7f547cbdffe0eec081760d1a2507","src/symbolize/gimli/coff.rs":"1a6d69aeb9c79d1acdeb054c1af050251c774d1328ef1a964d08f01c27f2bd2f","src/symbolize/gimli/elf.rs":"0b11415c75302bd4f70abf5147e83595fba38fcd54344170aedce1cb70049807","src/symbolize/gimli/libs_dl_iterate_phdr.rs":"bc64242857dd82288d6e7d6b183e651d05ab7bc4f037f19b9e42719f04fc2c83","src/symbolize/gimli/libs_haiku.rs":"0a0d4b37145e898f7068cadacccf362d8216e463e7026af2ce38d75ebfd74bea","src/symbolize/gimli/libs_illumos.rs":"523e96272b46bdaab2abb0dd0201cb8032bf86558cbed986a20d7e2cc02fa8be","src/symbolize/gimli/libs_libnx.rs":"4116eceadb2d9916d4f5602712eacec647f185d4c53c723aced8de5fc471b14d","src/symbolize/gimli/libs_macos.rs":"c24cb480ae029b350325873ac4358104e5943ad61b62eb22bb6b65b2f05bbd29","src/symbolize/gimli/libs_windows.rs":"6459f8610ca1a0fd7456539ec604f5276c94b3d0d7331357eaed338e49220a02","src/symbolize/gimli/macho.rs":"3cb44a7ff72d0b8c619463c2346f2cfdc378996bb523ceb0c5ab22b1443035b6","src/symbolize/gimli/mmap_fake.rs":"9564fcf47000e70d521b31518e205c8e6ee09b7410fb1eb1e452721757ff54ba","src/symbolize/gimli/mmap_unix.rs":"7d3d7bc6e5d34e3ecb1fe8b30d36bed404b4b9cd79d3b771c91215abfabb9ad1","src/symbolize/gimli/mmap_windows.rs":"a80bada1cef7e2ba1cff7b211eaa53b816248a7c89713c8cc6a70996f727efe4","src/symbolize/gimli/parse_running_mmaps_unix.rs":"b0bffbe15bc55920ecbeb6afe547f81a19a6e428e1a5038d33b8a5a837fe8c3b","src/symbolize/gimli/stash.rs":"69153136df5cb9bf955430c0a2f43c6131834cb7846631f39b58c074496a6ef0","src/symbolize/miri.rs":"f5201cc8a7de24ad3424d2472cb0af59cd28563d09cc0c21e998f4cee4367ade","src/symbolize/mod.rs":"b8248e5210a3a6ddd32c09dbb46c67efaceba7638a6688a5c27f30af7b991534","src/symbolize/noop.rs":"5d4432079b8ae2b9382945a57ae43df57bb4b7ed2e5956d4167e051a44567388","src/types.rs":"f43c94b99d57ca66a5cfe939a46016c95b2d69d82695fb52480f7a3e5b344fd9","src/windows.rs":"c45d95310d787f0be05f1a297b8a954defcd7bdfa48bab38c7196f5875b89852","tests/accuracy/auxiliary.rs":"71d2238da401042e007ef5ee20336d6834724bae96d93c8c52d11a5a332d7d34","tests/accuracy/main.rs":"f8e42aeeb50b35fca380db2e9fe52820cc0bc3133167289c5710e3290701e78e","tests/common/mod.rs":"733101288a48cf94d5a87a1957724deaf2650c3e4e8aa0190a4a7db62aa90d01","tests/concurrent-panics.rs":"b60279ad5c4fb9b2754807f35179cbc8fbd7acbe6e92ac6d0f416ae75db38705","tests/current-exe-mismatch.rs":"540523069f005a9a0822497c6e1c5b7f0df442f0cef6b6e411d6f600bcd0be15","tests/long_fn_name.rs":"ebef58e34543ed4d47048faa9b6525f68fc71e12255af734523a513c5d4baa6f","tests/skip_inner_frames.rs":"6c03cd0ad9facf0aa81e59cf970504785b6ada9993a2dfc2aea0b18b79419aeb","tests/smoke.rs":"33014495f9158aea2d0ee2ee3335ffe82105c7ed894f96eaf7d23845a60f7439"},"package":"2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"} \ No newline at end of file diff --git a/vendor/backtrace/Cargo.lock b/vendor/backtrace/Cargo.lock index 668232168..e027f8099 100644 --- a/vendor/backtrace/Cargo.lock +++ b/vendor/backtrace/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,7 +19,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" dependencies = [ "addr2line", "cc", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" [[package]] name = "cfg-if" @@ -49,30 +49,30 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cpp_demangle" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if", ] [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" -version = "0.7.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ "cfg-if", "winapi", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "miniz_oxide" @@ -95,36 +95,36 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ - "unicode-ident", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "rustc-serialize" @@ -134,18 +134,18 @@ checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -154,20 +154,20 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", - "unicode-ident", + "unicode-xid", ] [[package]] -name = "unicode-ident" -version = "1.0.9" +name = "unicode-xid" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "winapi" diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml index f33884ae4..c13e7ee30 100644 --- a/vendor/backtrace/Cargo.toml +++ b/vendor/backtrace/Cargo.toml @@ -12,9 +12,10 @@ [package] edition = "2018" name = "backtrace" -version = "0.3.68" +version = "0.3.69" authors = ["The Rust Project Developers"] build = "build.rs" +exclude = ["/ci/"] autoexamples = true autotests = true description = """ @@ -62,10 +63,6 @@ name = "current-exe-mismatch" harness = false required-features = ["std"] -[dependencies.addr2line] -version = "0.20.0" -default-features = false - [dependencies.cfg-if] version = "1.0" @@ -75,26 +72,6 @@ features = ["alloc"] optional = true default-features = false -[dependencies.libc] -version = "0.2.146" -default-features = false - -[dependencies.miniz_oxide] -version = "0.7.0" -default-features = false - -[dependencies.object] -version = "0.31.1" -features = [ - "read_core", - "elf", - "macho", - "pe", - "unaligned", - "archive", -] -default-features = false - [dependencies.rustc-demangle] version = "0.1.4" @@ -139,6 +116,30 @@ verify-winapi = [ "winapi/winnt", ] +[target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line] +version = "0.21.0" +default-features = false + +[target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.libc] +version = "0.2.146" +default-features = false + +[target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.miniz_oxide] +version = "0.7.0" +default-features = false + +[target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.object] +version = "0.32.0" +features = [ + "read_core", + "elf", + "macho", + "pe", + "unaligned", + "archive", +] +default-features = false + [target."cfg(windows)".dependencies.winapi] version = "0.3.9" optional = true diff --git a/vendor/backtrace/build.rs b/vendor/backtrace/build.rs index 812fbb1fe..9bd3abd16 100644 --- a/vendor/backtrace/build.rs +++ b/vendor/backtrace/build.rs @@ -1,8 +1,10 @@ extern crate cc; use std::env; +use std::path::Path; -fn main() { +// Must be public so the build script of `std` can call it. +pub fn main() { match env::var("CARGO_CFG_TARGET_OS").unwrap_or_default().as_str() { "android" => build_android(), _ => {} @@ -10,7 +12,13 @@ fn main() { } fn build_android() { - let expansion = match cc::Build::new().file("src/android-api.c").try_expand() { + // Resolve `src/android-api.c` relative to this file. + // Required to support calling this from the `std` build script. + let android_api_c = Path::new(file!()) + .parent() + .unwrap() + .join("src/android-api.c"); + let expansion = match cc::Build::new().file(android_api_c).try_expand() { Ok(result) => result, Err(e) => { println!("failed to run C compiler: {}", e); diff --git a/vendor/backtrace/ci/android-ndk.sh b/vendor/backtrace/ci/android-ndk.sh deleted file mode 100755 index 38521daf1..000000000 --- a/vendor/backtrace/ci/android-ndk.sh +++ /dev/null @@ -1,14 +0,0 @@ -set -ex - -ANDROID_NDK_URL=https://dl.google.com/android/repository -ANDROID_NDK_ARCHIVE=android-ndk-r25b-linux.zip - -mkdir /android-toolchain -cd /android-toolchain -curl -fO $ANDROID_NDK_URL/$ANDROID_NDK_ARCHIVE -unzip -q $ANDROID_NDK_ARCHIVE -rm $ANDROID_NDK_ARCHIVE -mv android-ndk-* ndk - -cd /tmp -rm -rf android diff --git a/vendor/backtrace/ci/android-sdk.sh b/vendor/backtrace/ci/android-sdk.sh deleted file mode 100755 index 7fde9a97f..000000000 --- a/vendor/backtrace/ci/android-sdk.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# Prep the SDK and emulator -# -# Note that the update process requires that we accept a bunch of licenses, and -# we can't just pipe `yes` into it for some reason, so we take the same strategy -# located in https://github.com/appunite/docker by just wrapping it in a script -# which apparently magically accepts the licenses. - -SDK=4333796 -mkdir sdk -curl --retry 20 https://dl.google.com/android/repository/sdk-tools-linux-${SDK}.zip -O -unzip -q -d sdk sdk-tools-linux-${SDK}.zip - -case "$1" in - arm | armv7) - api=24 - image="system-images;android-${api};google_apis;armeabi-v7a" - ;; - aarch64) - api=24 - image="system-images;android-${api};google_apis;arm64-v8a" - ;; - i686) - api=28 - image="system-images;android-${api};default;x86" - ;; - x86_64) - api=28 - image="system-images;android-${api};default;x86_64" - ;; - *) - echo "invalid arch: $1" - exit 1 - ;; -esac; - -# Try to fix warning about missing file. -# See https://askubuntu.com/a/1078784 -mkdir -p /root/.android/ -echo '### User Sources for Android SDK Manager' >> /root/.android/repositories.cfg -echo '#Fri Nov 03 10:11:27 CET 2017 count=0' >> /root/.android/repositories.cfg - -# Print all available packages -# yes | ./sdk/tools/bin/sdkmanager --list --verbose - -# --no_https avoids -# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found -# -# | grep -v = || true removes the progress bar output from the sdkmanager -# which produces an insane amount of output. -yes | ./sdk/tools/bin/sdkmanager --licenses --no_https | grep -v = || true -yes | ./sdk/tools/bin/sdkmanager --no_https \ - "emulator" \ - "platform-tools" \ - "platforms;android-${api}" \ - "${image}" | grep -v = || true - -echo "no" | - ./sdk/tools/bin/avdmanager create avd \ - --name "${1}" \ - --package "${image}" | grep -v = || true - diff --git a/vendor/backtrace/ci/debuglink-docker.sh b/vendor/backtrace/ci/debuglink-docker.sh deleted file mode 100755 index acb19e98b..000000000 --- a/vendor/backtrace/ci/debuglink-docker.sh +++ /dev/null @@ -1,29 +0,0 @@ -# Small script to run debuglink tests inside a docker image. -# Creates a writable mount on /usr/lib/debug. - -set -ex - -run() { - cargo generate-lockfile --manifest-path crates/debuglink/Cargo.toml - mkdir -p target crates/debuglink/target debug - docker build -t backtrace -f ci/docker/$1/Dockerfile ci - docker run \ - --user `id -u`:`id -g` \ - --rm \ - --init \ - --volume $(dirname $(dirname `which cargo`)):/cargo \ - --env CARGO_HOME=/cargo \ - --volume `rustc --print sysroot`:/rust:ro \ - --env TARGET=$1 \ - --volume `pwd`:/checkout:ro \ - --volume `pwd`/target:/checkout/crates/debuglink/target \ - --workdir /checkout \ - --volume `pwd`/debug:/usr/lib/debug \ - --privileged \ - --env RUSTFLAGS \ - backtrace \ - bash \ - -c 'PATH=$PATH:/rust/bin exec ci/debuglink.sh' -} - -run x86_64-unknown-linux-gnu diff --git a/vendor/backtrace/ci/debuglink.sh b/vendor/backtrace/ci/debuglink.sh deleted file mode 100755 index b2da2013d..000000000 --- a/vendor/backtrace/ci/debuglink.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -# Debuglink tests. -# We build crates/debuglink and then move its debuginfo around -# and test that it can still find the debuginfo. - -set -ex - -cratedir=`pwd`/crates/debuglink -exefile=crates/debuglink/target/debug/debuglink - -# Baseline; no separate debug -cargo build --manifest-path crates/debuglink/Cargo.toml -$exefile $cratedir - -# Separate debug in same dir -debugfile1=`dirname $exefile`/debuglink.debug -objcopy --only-keep-debug $exefile $debugfile1 -strip -g $exefile -(cd `dirname $exefile` && objcopy --add-gnu-debuglink=debuglink.debug debuglink) -$exefile $cratedir - -# Separate debug in .debug subdir -debugfile2=`dirname $exefile`/.debug/debuglink.debug -mkdir -p `dirname $debugfile2` -mv $debugfile1 $debugfile2 -$exefile $cratedir - -# Separate debug in /usr/lib/debug subdir -debugfile3="/usr/lib/debug/$cratedir/target/debug/debuglink.debug" -mkdir -p `dirname $debugfile3` -mv $debugfile2 $debugfile3 -$exefile $cratedir - -# Separate debug in /usr/lib/debug/.build-id subdir -id=`readelf -n $exefile | grep '^ Build ID: [0-9a-f]' | cut -b 15-` -idfile="/usr/lib/debug/.build-id/${id:0:2}/${id:2}.debug" -mkdir -p `dirname $idfile` -mv $debugfile3 $idfile -$exefile $cratedir - -# Replace idfile with a symlink (this is the usual arrangement) -mv $idfile $debugfile3 -ln -s $debugfile3 $idfile -$exefile $cratedir - -# Supplementary object file using relative path -dwzfile="/usr/lib/debug/.dwz/debuglink.debug" -mkdir -p `dirname $dwzfile` -cp $debugfile3 $debugfile3.copy -dwz -m $dwzfile -rh $debugfile3 $debugfile3.copy -rm $debugfile3.copy -$exefile $cratedir - -# Supplementary object file using build ID -dwzid=`readelf -n $dwzfile | grep '^ Build ID: [0-9a-f]' | cut -b 15-` -dwzidfile="/usr/lib/debug/.build-id/${dwzid:0:2}/${dwzid:2}.debug" -mkdir -p `dirname $dwzidfile` -mv $dwzfile $dwzidfile -$exefile $cratedir -mv $dwzidfile $dwzfile - -# Missing debug should fail -mv $debugfile3 $debugfile3.tmp -! $exefile $cratedir -mv $debugfile3.tmp $debugfile3 - -# Missing dwz should fail -mv $dwzfile $dwzfile.tmp -! $exefile $cratedir -mv $dwzfile.tmp $dwzfile - -# Cleanup -rm $idfile $debugfile3 $dwzfile -echo Success diff --git a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile deleted file mode 100644 index 906c68789..000000000 --- a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \ - CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 871b353c0..000000000 --- a/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-aarch64-linux-gnu \ - libc6-dev-arm64-cross \ - qemu-user - -ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" diff --git a/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile b/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile deleted file mode 100644 index 7471dcb73..000000000 --- a/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \ - CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile deleted file mode 100644 index 24665972c..000000000 --- a/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-arm-linux-gnueabihf \ - libc6-dev-armhf-cross \ - qemu-user -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" diff --git a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile b/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile deleted file mode 100644 index 543fcd243..000000000 --- a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \ - CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile deleted file mode 100644 index 6f7d0fd36..000000000 --- a/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-arm-linux-gnueabihf \ - libc6-dev-armhf-cross \ - qemu-user -ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" diff --git a/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 316a233e3..000000000 --- a/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc-multilib \ - libc6-dev \ - ca-certificates diff --git a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile b/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile deleted file mode 100644 index 61cb9d075..000000000 --- a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \ - CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 316a233e3..000000000 --- a/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc-multilib \ - libc6-dev \ - ca-certificates diff --git a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 7ca5a64bf..000000000 --- a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross \ - qemu-user \ - qemu-system-ppc - -ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \ - # TODO: should actually run these tests - #CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \ - CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER=echo \ - CC=powerpc64-linux-gnu-gcc diff --git a/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 7c19dcbb4..000000000 --- a/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-s390x-linux-gnu \ - libc6-dev-s390x-cross \ - qemu-user \ - # There seems to be a bug in processing mixed-architecture - # ld.so.cache files that causes crashes in some cases. Work - # around this by simply deleting the cache for now. - && rm /etc/ld.so.cache - -ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \ - CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /usr/s390x-linux-gnu" \ - CC=s390x-linux-gnu-gcc diff --git a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile deleted file mode 100644 index 4c8922936..000000000 --- a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang \ - CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile b/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile deleted file mode 100644 index a8e859e67..000000000 --- a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - gcc-mingw-w64-x86-64 - -# No need to run tests, we're just testing that it compiles -ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=echo \ - CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc diff --git a/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 551ab1378..000000000 --- a/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - dwz diff --git a/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile deleted file mode 100644 index e77e41f5b..000000000 --- a/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - musl-tools diff --git a/vendor/backtrace/ci/run-docker.sh b/vendor/backtrace/ci/run-docker.sh deleted file mode 100755 index 8aa6d84a4..000000000 --- a/vendor/backtrace/ci/run-docker.sh +++ /dev/null @@ -1,33 +0,0 @@ -# Small script to run tests for a target (or all targets) inside all the -# respective docker images. - -set -ex - -run() { - docker build -t backtrace -f ci/docker/$1/Dockerfile ci - mkdir -p target - docker run \ - --user `id -u`:`id -g` \ - --rm \ - --init \ - --volume $(dirname $(dirname `which cargo`)):/cargo \ - --env CARGO_HOME=/cargo \ - --volume `rustc --print sysroot`:/rust:ro \ - --env TARGET=$1 \ - --volume `pwd`:/checkout:ro \ - --volume `pwd`/target:/checkout/target \ - --workdir /checkout \ - --privileged \ - --env RUSTFLAGS \ - backtrace \ - bash \ - -c 'PATH=$PATH:/rust/bin exec ci/run.sh' -} - -if [ -z "$1" ]; then - for d in `ls ci/docker/`; do - run $d - done -else - run $1 -fi diff --git a/vendor/backtrace/ci/run.sh b/vendor/backtrace/ci/run.sh deleted file mode 100755 index 166b387e4..000000000 --- a/vendor/backtrace/ci/run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -ex - -cargo test --target $TARGET -cargo build --target $TARGET --manifest-path crates/as-if-std/Cargo.toml diff --git a/vendor/backtrace/ci/runtest-android.rs b/vendor/backtrace/ci/runtest-android.rs deleted file mode 100644 index dc70121dc..000000000 --- a/vendor/backtrace/ci/runtest-android.rs +++ /dev/null @@ -1,50 +0,0 @@ -use std::env; -use std::process::Command; -use std::path::{Path, PathBuf}; - -fn main() { - let args = env::args_os() - .skip(1) - .filter(|arg| arg != "--quiet") - .collect::>(); - assert_eq!(args.len(), 1); - let test = PathBuf::from(&args[0]); - let dst = Path::new("/data/local/tmp").join(test.file_name().unwrap()); - - println!("waiting for device to come online..."); - let status = Command::new("adb") - .arg("wait-for-device") - .status() - .expect("failed to run: adb wait-for-device"); - assert!(status.success()); - - println!("pushing executable..."); - let status = Command::new("adb") - .arg("push") - .arg(&test) - .arg(&dst) - .status() - .expect("failed to run: adb pushr"); - assert!(status.success()); - - println!("executing tests..."); - let output = Command::new("adb") - .arg("shell") - .arg(&dst) - .output() - .expect("failed to run: adb shell"); - assert!(status.success()); - - println!("status: {}\nstdout ---\n{}\nstderr ---\n{}", - output.status, - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(&output.stderr)); - - let stdout = String::from_utf8_lossy(&output.stdout); - stdout.lines().find(|l| - (l.starts_with("PASSED ") && l.contains(" tests")) || - l.starts_with("test result: ok") - ).unwrap_or_else(|| { - panic!("failed to find successful test run"); - }); -} diff --git a/vendor/backtrace/src/print.rs b/vendor/backtrace/src/print.rs index 8d9cbe3d4..395328a0a 100644 --- a/vendor/backtrace/src/print.rs +++ b/vendor/backtrace/src/print.rs @@ -83,7 +83,8 @@ impl<'a, 'b> BacktraceFmt<'a, 'b> { /// This is currently a no-op but is added for future compatibility with /// backtrace formats. pub fn finish(&mut self) -> fmt::Result { - // Currently a no-op-- including this hook to allow for future additions. + #[cfg(target_os = "fuchsia")] + fuchsia::finish_context(self.fmt)?; Ok(()) } diff --git a/vendor/backtrace/src/print/fuchsia.rs b/vendor/backtrace/src/print/fuchsia.rs index ce3f17862..cb872697d 100644 --- a/vendor/backtrace/src/print/fuchsia.rs +++ b/vendor/backtrace/src/print/fuchsia.rs @@ -425,7 +425,7 @@ impl DsoPrinter<'_, '_> { /// This function prints the Fuchsia symbolizer markup for all information contained in a DSO. pub fn print_dso_context(out: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - out.write_str("{{{reset}}}\n")?; + out.write_str("{{{reset:begin}}}\n")?; let mut visitor = DsoPrinter { writer: out, module_count: 0, @@ -434,3 +434,8 @@ pub fn print_dso_context(out: &mut core::fmt::Formatter<'_>) -> core::fmt::Resul for_each_dso(&mut visitor); visitor.error } + +/// This function prints the Fuchsia symbolizer markup to end the backtrace. +pub fn finish_context(out: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + out.write_str("{{{reset:end}}}\n") +} diff --git a/vendor/backtrace/src/symbolize/gimli/parse_running_mmaps_unix.rs b/vendor/backtrace/src/symbolize/gimli/parse_running_mmaps_unix.rs index deeeb2971..5d4b34675 100644 --- a/vendor/backtrace/src/symbolize/gimli/parse_running_mmaps_unix.rs +++ b/vendor/backtrace/src/symbolize/gimli/parse_running_mmaps_unix.rs @@ -85,16 +85,37 @@ impl FromStr for MapsEntry { // e.g.: "ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0 [vsyscall]" // e.g.: "7f5985f46000-7f5985f48000 rw-p 00039000 103:06 76021795 /usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" // e.g.: "35b1a21000-35b1a22000 rw-p 00000000 00:00 0" + // + // Note that paths may contain spaces, so we can't use `str::split` for parsing (until + // Split::remainder is stabilized #77998). fn from_str(s: &str) -> Result { - let mut parts = s - .split(' ') // space-separated fields - .filter(|s| s.len() > 0); // multiple spaces implies empty strings that need to be skipped. - let range_str = parts.next().ok_or("Couldn't find address")?; - let perms_str = parts.next().ok_or("Couldn't find permissions")?; - let offset_str = parts.next().ok_or("Couldn't find offset")?; - let dev_str = parts.next().ok_or("Couldn't find dev")?; - let inode_str = parts.next().ok_or("Couldn't find inode")?; - let pathname_str = parts.next().unwrap_or(""); // pathname may be omitted. + let (range_str, s) = s.trim_start().split_once(' ').unwrap_or((s, "")); + if range_str.is_empty() { + return Err("Couldn't find address"); + } + + let (perms_str, s) = s.trim_start().split_once(' ').unwrap_or((s, "")); + if perms_str.is_empty() { + return Err("Couldn't find permissions"); + } + + let (offset_str, s) = s.trim_start().split_once(' ').unwrap_or((s, "")); + if offset_str.is_empty() { + return Err("Couldn't find offset"); + } + + let (dev_str, s) = s.trim_start().split_once(' ').unwrap_or((s, "")); + if dev_str.is_empty() { + return Err("Couldn't find dev"); + } + + let (inode_str, s) = s.trim_start().split_once(' ').unwrap_or((s, "")); + if inode_str.is_empty() { + return Err("Couldn't find inode"); + } + + // Pathname may be omitted in which case it will be empty + let pathname_str = s.trim_start(); let hex = |s| usize::from_str_radix(s, 16).map_err(|_| "Couldn't parse hex number"); let address = if let Some((start, limit)) = range_str.split_once('-') { @@ -229,4 +250,46 @@ fn check_maps_entry_parsing_32bit() { pathname: Default::default(), } ); + assert_eq!( + "b7c79000-b7e02000 r--p 00000000 08:01 60662705 \ + /executable/path/with some spaces" + .parse::() + .unwrap(), + MapsEntry { + address: (0xb7c79000, 0xb7e02000), + perms: ['r', '-', '-', 'p'], + offset: 0x00000000, + dev: (0x08, 0x01), + inode: 0x60662705, + pathname: "/executable/path/with some spaces".into(), + } + ); + assert_eq!( + "b7c79000-b7e02000 r--p 00000000 08:01 60662705 \ + /executable/path/with multiple-continuous spaces " + .parse::() + .unwrap(), + MapsEntry { + address: (0xb7c79000, 0xb7e02000), + perms: ['r', '-', '-', 'p'], + offset: 0x00000000, + dev: (0x08, 0x01), + inode: 0x60662705, + pathname: "/executable/path/with multiple-continuous spaces ".into(), + } + ); + assert_eq!( + " b7c79000-b7e02000 r--p 00000000 08:01 60662705 \ + /executable/path/starts-with-spaces" + .parse::() + .unwrap(), + MapsEntry { + address: (0xb7c79000, 0xb7e02000), + perms: ['r', '-', '-', 'p'], + offset: 0x00000000, + dev: (0x08, 0x01), + inode: 0x60662705, + pathname: "/executable/path/starts-with-spaces".into(), + } + ); } diff --git a/vendor/backtrace/src/symbolize/mod.rs b/vendor/backtrace/src/symbolize/mod.rs index dbc346522..a7c199506 100644 --- a/vendor/backtrace/src/symbolize/mod.rs +++ b/vendor/backtrace/src/symbolize/mod.rs @@ -471,7 +471,7 @@ cfg_if::cfg_if! { mod dbghelp; use dbghelp as imp; } else if #[cfg(all( - any(unix, windows), + any(unix, all(windows, target_env = "gnu")), not(target_vendor = "uwp"), not(target_os = "emscripten"), any(not(backtrace_in_libstd), feature = "backtrace"), diff --git a/vendor/backtrace/src/windows.rs b/vendor/backtrace/src/windows.rs index 9ec3ba99b..92c2b2e66 100644 --- a/vendor/backtrace/src/windows.rs +++ b/vendor/backtrace/src/windows.rs @@ -177,9 +177,9 @@ macro_rules! ffi { assert_eq!($name as usize, winapi::$name as usize); let mut x: unsafe extern "system" fn($($args)*) -> $ret; x = $name; - drop(x); + let _ = x; x = winapi::$name; - drop(x); + let _ = x; } } )* -- cgit v1.2.3