Skip to content

Commit 17eb493

Browse files
committed
Delimiter string filtering has been moved from parse_stacktrace to extract_stacktrace in csharp.rs.
1 parent 4490f7a commit 17eb493

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

libcasr/src/csharp.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl ParseStacktrace for CSharpStacktrace {
2424
.as_str()
2525
.split('\n')
2626
.map(|s| s.trim().to_string())
27-
.filter(|s| !s.is_empty())
27+
.filter(|s| !s.is_empty() && s != "--- End of inner exception stack trace ---")
2828
.collect::<Vec<String>>())
2929
}
3030

@@ -110,10 +110,7 @@ impl ParseStacktrace for CSharpStacktrace {
110110
fn parse_stacktrace(entries: &[String]) -> Result<Stacktrace> {
111111
entries
112112
.iter()
113-
.filter_map(|s| {
114-
(s != "--- End of inner exception stack trace ---")
115-
.then_some(Self::parse_stacktrace_entry(s))
116-
})
113+
.map(|s| Self::parse_stacktrace_entry(s))
117114
.collect()
118115
}
119116
}
@@ -243,15 +240,10 @@ Unhandled exception. System.ArgumentException: 1111 ---> System.IO.IOException:
243240
";
244241

245242
let trace = [
246-
"--- End of inner exception stack trace ---",
247-
"--- End of inner exception stack trace ---",
248-
"--- End of inner exception stack trace ---",
249243
"at C.qwe()",
250244
"at B..ctor() in /home/user/dotnet/2/A.cs:line 37",
251245
"at A`1.<>c.<set_Q>b__1_1() in /home/user/dotnet/2/A.cs:line 15",
252246
"at A`1.h[Z](Func`1 a)",
253-
"--- End of inner exception stack trace ---",
254-
"--- End of inner exception stack trace ---",
255247
"at A`1[T].<set_Q>g__g|1_0 (System.Int32[] arr) <0x40b745f0 + 0x00122> in /home/user/mono/2/src/2.cs:13",
256248
"at System.Threading._ThreadPoolWaitCallback.PerformWaitCallback () [0x00000] in <c79446e93efd45a0b7bc2f9631593aff>:0",
257249
"at A`1[T].set_Q (System.Int32 value) <0x40275140 + 0x00082> in <f6b2b0ea894844dc83a96f9504d8f570#610bc057486c618efb3936233b088988>:0",

0 commit comments

Comments
 (0)