Skip to content

Commit 5243072

Browse files
alexcrichtonbadboy
authored andcommitted
test: Fix a test on MSVC
Apparently MSVC now has namespaces in backtraces!
1 parent f38762a commit 5243072

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

src/test/run-pass/backtrace.rs

+1-13
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,7 @@ fn template(me: &str) -> Command {
4646
}
4747

4848
fn expected(fn_name: &str) -> String {
49-
// FIXME(#32481)
50-
//
51-
// On windows, we read the function name from debuginfo using some
52-
// system APIs. For whatever reason, these APIs seem to use the
53-
// "name" field, which is only the "relative" name, not the full
54-
// name with namespace info, so we just see `foo` and not
55-
// `backtrace::foo` as we see on linux (which uses the linkage
56-
// name).
57-
if cfg!(windows) && cfg!(target_env = "msvc") {
58-
format!(" - {}", fn_name)
59-
} else {
60-
format!(" - backtrace::{}", fn_name)
61-
}
49+
format!(" - backtrace::{}", fn_name)
6250
}
6351

6452
fn runtest(me: &str) {

0 commit comments

Comments
 (0)