Merging upstream version 1.75.0+dfsg1.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/tests/run-coverage/closure_macro.coverage b/tests/run-coverage/closure_macro.coverage
deleted file mode 100644
index 0f2c917e0..000000000
--- a/tests/run-coverage/closure_macro.coverage
+++ /dev/null
@@ -1,42 +0,0 @@
-   LL|       |// compile-flags: --edition=2018
-   LL|       |#![feature(coverage_attribute)]
-   LL|       |
-   LL|       |macro_rules! bail {
-   LL|       |    ($msg:literal $(,)?) => {
-   LL|       |        if $msg.len() > 0 {
-   LL|       |            println!("no msg");
-   LL|       |        } else {
-   LL|       |            println!($msg);
-   LL|       |        }
-   LL|       |        return Err(String::from($msg));
-   LL|       |    };
-   LL|       |}
-   LL|       |
-   LL|       |macro_rules! on_error {
-   LL|       |    ($value:expr, $error_message:expr) => {
-   LL|       |        $value.or_else(|e| { // FIXME(85000): no coverage in closure macros
-   LL|       |            let message = format!($error_message, e);
-   LL|       |            if message.len() > 0 {
-   LL|       |                println!("{}", message);
-   LL|       |                Ok(String::from("ok"))
-   LL|       |            } else {
-   LL|       |                bail!("error");
-   LL|       |            }
-   LL|       |        })
-   LL|       |    };
-   LL|       |}
-   LL|       |
-   LL|      1|fn load_configuration_files() -> Result<String, String> {
-   LL|      1|    Ok(String::from("config"))
-   LL|      1|}
-   LL|       |
-   LL|      1|pub fn main() -> Result<(), String> {
-   LL|      1|    println!("Starting service");
-   LL|      1|    let config = on_error!(load_configuration_files(), "Error loading configs: {}")?;
-                                                                                                 ^0
-   LL|       |
-   LL|      1|    let startup_delay_duration = String::from("arg");
-   LL|      1|    let _ = (config, startup_delay_duration);
-   LL|      1|    Ok(())
-   LL|      1|}
-