Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 9 insertions, 8 deletions

diff --git a/vendor/tester/.cargo-checksum.json b/vendor/tester/.cargo-checksum.json
index 4d4264f5d..74b7ae75e 100644
--- a/vendor/tester/.cargo-checksum.json
+++ b/vendor/tester/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"bf1ac66ffd3f35b6c44666983706f7543acd4113fc2c1c0d5936e3e2ea9d3fdc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/bench.rs":"48df8476bb898460ebee230d7d2356e05c61f165bd6a32e52c51d37644096a3c","src/cli.rs":"67cb49da63c514bfe533de3b85cf701a8bd82546d1943be35846058f3833ce12","src/console.rs":"6bb950d76dc0c5c1ca964bf50d27f9ffb1073108c8871be410da156cad8e9001","src/event.rs":"913d4675d30fd495af627e83007d2757e994dd9eb69445f34cb3019b4026072d","src/formatters/json.rs":"62abbf4aa3addc8a9486dcf33bc677a287ded188b7275f801cd2535d5da57107","src/formatters/mod.rs":"aab60700582bfba206627316fb3e4b3c2d15f901d258954280c266369e04f12d","src/formatters/pretty.rs":"3abb30b1c0d05b9c04469e86b35d02cd39da54bd892989682f47348c70db3c99","src/formatters/terse.rs":"a80aa8dc90c7f0697e8c242f4f460ad681092a5430da9ce6eb895952d0444b42","src/helpers/concurrency.rs":"7edf94296b60d34985556def92ea6fc8213d5a7d65336e6e60818f1e4ee8cc75","src/helpers/exit_code.rs":"f287fb8e04e80a80e19e1b1e7e61f91bd22697844d78b507814212dacb279775","src/helpers/isatty.rs":"f5e6b712f6f585c45ee89728aefbbfed77b7550e9f3961f5e41b2e7f247401ce","src/helpers/metrics.rs":"fa3287341b4201b4f693dd0ff9c4a680c2e1a8fccb0d8c1f684ada508f68239b","src/helpers/mod.rs":"a1c45234b2547ff230d226c7d1f456551e20eff218fbf602af4508c3a789068c","src/lib.rs":"6ae0871de1a2fa655b3e0d308b092c03b967f8a4f6cbbcf273f27e959194c891","src/options.rs":"a22c74034f4c6da90f3a2af53065285413a0c8127518fd3d2d360367640abd1e","src/stats.rs":"3fb9a292083e1bf5fb450079da6cefe5f38b108f8f7038118897df345f6eaa74","src/stats/tests.rs":"ab9d8daefa2ddfed3da778561705f75539f31f4afbed29370d9f79ccc9ea2883","src/test_result.rs":"36e9759e10182e7b1e2bd6aa91575c805b6298301ff727db01929cf76599039b","src/tests.rs":"f48fcc46633d8ea343e3ca7697dd4153cc9b90e3e32c85297ea3d4e9abd931b4","src/time.rs":"b2371011018625dd1ef85fc8f0fd749700c240fd6d20e19d4ded4ba217c40b1c","src/types.rs":"388639b98155b547fea20abad7423f24b88c5f6312231388a5638ea8d6c79090"},"package":"0639d10d8f4615f223a57275cf40f9bdb7cfbb806bcb7f7cc56e3beb55a576eb"}
\ No newline at end of file
+{"files":{"Cargo.toml":"77ede62f88c71ef75b0cd655d01cd1593a276fa29bacd0683ad04c15b9a8ccb8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/bench.rs":"48df8476bb898460ebee230d7d2356e05c61f165bd6a32e52c51d37644096a3c","src/cli.rs":"67cb49da63c514bfe533de3b85cf701a8bd82546d1943be35846058f3833ce12","src/console.rs":"6bb950d76dc0c5c1ca964bf50d27f9ffb1073108c8871be410da156cad8e9001","src/event.rs":"913d4675d30fd495af627e83007d2757e994dd9eb69445f34cb3019b4026072d","src/formatters/json.rs":"62abbf4aa3addc8a9486dcf33bc677a287ded188b7275f801cd2535d5da57107","src/formatters/mod.rs":"aab60700582bfba206627316fb3e4b3c2d15f901d258954280c266369e04f12d","src/formatters/pretty.rs":"3abb30b1c0d05b9c04469e86b35d02cd39da54bd892989682f47348c70db3c99","src/formatters/terse.rs":"a80aa8dc90c7f0697e8c242f4f460ad681092a5430da9ce6eb895952d0444b42","src/helpers/concurrency.rs":"7edf94296b60d34985556def92ea6fc8213d5a7d65336e6e60818f1e4ee8cc75","src/helpers/exit_code.rs":"f287fb8e04e80a80e19e1b1e7e61f91bd22697844d78b507814212dacb279775","src/helpers/isatty.rs":"f5e6b712f6f585c45ee89728aefbbfed77b7550e9f3961f5e41b2e7f247401ce","src/helpers/metrics.rs":"fa3287341b4201b4f693dd0ff9c4a680c2e1a8fccb0d8c1f684ada508f68239b","src/helpers/mod.rs":"a1c45234b2547ff230d226c7d1f456551e20eff218fbf602af4508c3a789068c","src/lib.rs":"6ae0871de1a2fa655b3e0d308b092c03b967f8a4f6cbbcf273f27e959194c891","src/options.rs":"a22c74034f4c6da90f3a2af53065285413a0c8127518fd3d2d360367640abd1e","src/stats.rs":"3fb9a292083e1bf5fb450079da6cefe5f38b108f8f7038118897df345f6eaa74","src/stats/tests.rs":"ab9d8daefa2ddfed3da778561705f75539f31f4afbed29370d9f79ccc9ea2883","src/test_result.rs":"1ef5fbaf4e53c96946754d72972efa9a2c7ae1050a240ff387be050bbcd89948","src/tests.rs":"f48fcc46633d8ea343e3ca7697dd4153cc9b90e3e32c85297ea3d4e9abd931b4","src/time.rs":"b2371011018625dd1ef85fc8f0fd749700c240fd6d20e19d4ded4ba217c40b1c","src/types.rs":"388639b98155b547fea20abad7423f24b88c5f6312231388a5638ea8d6c79090"},"package":"89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f"}
\ No newline at end of file
diff --git a/vendor/tester/Cargo.toml b/vendor/tester/Cargo.toml
index 14e072d31..7d5dd1e2e 100644
--- a/vendor/tester/Cargo.toml
+++ b/vendor/tester/Cargo.toml
@@ -3,21 +3,21 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
 edition = "2018"
 name = "tester"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["The Rust Project Developers"]
 description = "A fork of Rust’s `test` crate that doesn’t require unstable language features."
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/messense/rustc-test"
+
 [dependencies.cfg-if]
 version = "1.0.0"
 
@@ -33,6 +33,7 @@ version = "0.7"
 [features]
 asm_black_box = []
 capture = []
+
 [target."cfg(unix)".dependencies.libc]
 version = "0.2"
 default-features = false
diff --git a/vendor/tester/src/test_result.rs b/vendor/tester/src/test_result.rs
index 465f3f8f9..def9225f1 100644
--- a/vendor/tester/src/test_result.rs
+++ b/vendor/tester/src/test_result.rs
@@ -30,7 +30,7 @@ unsafe impl Send for TestResult {}
 /// and associated data.
 pub fn calc_result<'a>(
     desc: &TestDesc,
-    task_result: Result<(), &'a (dyn Any + 'static + Send)>,
+    task_result: Result<(), &'a dyn Any>,
     time_opts: &Option<time::TestTimeOptions>,
     exec_time: &Option<time::TestExecTime>,
 ) -> TestResult {