Skip to content

Commit ef037e6

Browse files
committed
Fix tests
1 parent 3371fce commit ef037e6

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

build_sysroot/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ compiler_builtins = "0.1"
99
alloc = { path = "./sysroot_src/library/alloc" }
1010
std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
1111
test = { path = "./sysroot_src/library/test" }
12+
proc_macro = { path = "./sysroot_src/library/proc_macro" }
1213

1314
[patch.crates-io]
1415
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }

failing-ui-tests.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ tests/ui/generator/panic-safe.rs
6666
tests/ui/issues/issue-14875.rs
6767
tests/ui/issues/issue-29948.rs
6868
tests/ui/panic-while-printing.rs
69+
tests/ui/enum-discriminant/get_discr.rs
70+
tests/ui/panics/nested_panic_caught.rs

src/declare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
132132
pub fn mangle_name(name: &str) -> String {
133133
name.replace(|char: char| {
134134
if !char.is_alphanumeric() && char != '_' {
135-
debug_assert!("$.".contains(char), "Unsupported char in function name: {}", char);
135+
debug_assert!("$.*".contains(char), "Unsupported char in function name {}: {}", name, char);
136136
true
137137
}
138138
else {

test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ function test_rustc() {
350350
for test in $(rg -i --files-with-matches "//(\[\w+\])?~|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" tests/ui); do
351351
rm $test
352352
done
353+
rm tests/ui/consts/const_cmp_type_id.rs
354+
rm tests/ui/consts/issue-73976-monomorphic.rs
353355

354356
git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
355357

0 commit comments

Comments
 (0)