From 7a48407c9d2a985d7c0e5c1870442931a84d3ab4 Mon Sep 17 00:00:00 2001 From: BMikh0 Date: Mon, 18 Mar 2024 12:14:18 +0300 Subject: [PATCH] Delimiter string filtering has been moved from parse_stacktrace to extract_stacktrace in csharp.rs. --- libcasr/src/csharp.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libcasr/src/csharp.rs b/libcasr/src/csharp.rs index 928e76f9..194f50f5 100644 --- a/libcasr/src/csharp.rs +++ b/libcasr/src/csharp.rs @@ -24,7 +24,7 @@ impl ParseStacktrace for CSharpStacktrace { .as_str() .split('\n') .map(|s| s.trim().to_string()) - .filter(|s| !s.is_empty()) + .filter(|s| !s.is_empty() && s != "--- End of inner exception stack trace ---") .collect::>()) } @@ -110,10 +110,7 @@ impl ParseStacktrace for CSharpStacktrace { fn parse_stacktrace(entries: &[String]) -> Result { entries .iter() - .filter_map(|s| { - (s != "--- End of inner exception stack trace ---") - .then_some(Self::parse_stacktrace_entry(s)) - }) + .map(|s| Self::parse_stacktrace_entry(s)) .collect() } } @@ -243,15 +240,10 @@ Unhandled exception. System.ArgumentException: 1111 ---> System.IO.IOException: "; let trace = [ - "--- End of inner exception stack trace ---", - "--- End of inner exception stack trace ---", - "--- End of inner exception stack trace ---", "at C.qwe()", "at B..ctor() in /home/user/dotnet/2/A.cs:line 37", "at A`1.<>c.b__1_1() in /home/user/dotnet/2/A.cs:line 15", "at A`1.h[Z](Func`1 a)", - "--- End of inner exception stack trace ---", - "--- End of inner exception stack trace ---", "at A`1[T].g__g|1_0 (System.Int32[] arr) <0x40b745f0 + 0x00122> in /home/user/mono/2/src/2.cs:13", "at System.Threading._ThreadPoolWaitCallback.PerformWaitCallback () [0x00000] in :0", "at A`1[T].set_Q (System.Int32 value) <0x40275140 + 0x00082> in :0",