From dbaeb8f0677f1ce59806f1937d5731bb6ed32ae9 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 10 Aug 2021 18:26:09 -0600
Subject: [PATCH] Show ld.so expect message
---
src/ld_so/mod.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ld_so/mod.rs b/src/ld_so/mod.rs
index 9ea90885c..0cecd1128 100644
--- a/src/ld_so/mod.rs
+++ b/src/ld_so/mod.rs
@@ -47,7 +47,7 @@ impl<T, E: core::fmt::Debug> ExpectTlsFree for Result<T, E> {
fn expect_notls(self, msg: &str) -> T {
match self {
Ok(t) => t,
- Err(err) => panic_notls(format_args!("expect failed for Result with err: {:?}", err)),
+ Err(err) => panic_notls(format_args!("{}: expect failed for Result with err: {:?}", msg, err)),
}
}
}
@@ -57,7 +57,7 @@ impl<T> ExpectTlsFree for Option<T> {
fn expect_notls(self, msg: &str) -> T {
match self {
Some(t) => t,
- None => panic_notls("expect failed for Option"),
+ None => panic_notls(format_args!("{}: expect failed for Option", msg)),
}
}
}
--
GitLab