From 0a27bee814f5590403bc429355cb8e9f9a57ebfb Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 13 Sep 2025 12:46:00 -0600 Subject: [PATCH] Fix license allow list and clippy warning --- bin/src/main.rs | 4 ++-- deny.toml | 2 +- lib/src/lib.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/src/main.rs b/bin/src/main.rs index ff0430f..1b7074d 100644 --- a/bin/src/main.rs +++ b/bin/src/main.rs @@ -21,7 +21,7 @@ struct Args { fn main() -> Result<(), &'static str> { let args: Args = from_env(); - return if let Some(symbol) = demangle(args.symbol.as_str(), &DemangleOptions { + if let Some(symbol) = demangle(args.symbol.as_str(), &DemangleOptions { omit_empty_parameters: !args.keep_void, mw_extensions: args.mw_extensions, }) { @@ -29,5 +29,5 @@ fn main() -> Result<(), &'static str> { Ok(()) } else { Err("Failed to demangle symbol") - }; + } } diff --git a/deny.toml b/deny.toml index 827de76..5a71998 100644 --- a/deny.toml +++ b/deny.toml @@ -92,7 +92,7 @@ allow = [ "MIT", "Apache-2.0", "BSD-3-Clause", - "Unicode-DFS-2016", + "Unicode-3.0", ] # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 5d6eb35..85fa074 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -426,8 +426,8 @@ pub fn demangle(mut str: &str, options: &DemangleOptions) -> Option { } let rest = &rest[1..]; if let Some((_, rest2)) = parse_digits(rest) { - if rest2.starts_with('@') { - let fn_demangled = demangle(&rest2[1..], options)?; + if let Some(stripped) = rest2.strip_prefix('@') { + let fn_demangled = demangle(stripped, options)?; thunk_res = Some(format!("virtual thunk to {fn_demangled}")); } }