diff options
| author | bors <bors@rust-lang.org> | 2023-06-03 19:18:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-03 19:18:43 +0000 |
| commit | 398fa2187c88de46c13c142f600064483a563c86 (patch) | |
| tree | 74d42d4297d81015c6bc14c0ddd08cb88956d5d4 /tests/codegen/debug-column.rs | |
| parent | 2f5e6bb817c115c067ff47453eb9aa89a0a31358 (diff) | |
| parent | d4f87d1e4f2b18bfc6eb01a9eef7b908fb9346eb (diff) | |
| download | rust-398fa2187c88de46c13c142f600064483a563c86.tar.gz rust-398fa2187c88de46c13c142f600064483a563c86.zip | |
Auto merge of #112253 - matthiaskrgr:rollup-c37jpm5, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #111659 (suggest `Option::as_deref(_mut)` on type mismatch in option combinator if it passes typeck) - #111702 (Option::map_or_else: Show an example of integrating with Result) - #111878 (Fix codegen test suite for bare-metal-like targets) - #111969 (bootstrap: Make `clean` respect `dry-run`) - #111998 (Add other workspaces to `linkedProjects` in rust_analyzer_settings) - #112215 (only suppress coercion error if type is definitely unsized) - #112231 (Make sure the build.rustc version is either the same or 1 apart (revised)) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/codegen/debug-column.rs')
| -rw-r--r-- | tests/codegen/debug-column.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codegen/debug-column.rs b/tests/codegen/debug-column.rs index e61642b8e1b..f3b19a2eb2f 100644 --- a/tests/codegen/debug-column.rs +++ b/tests/codegen/debug-column.rs @@ -6,11 +6,11 @@ fn main() { unsafe { // Column numbers are 1-based. Regression test for #65437. - // CHECK: call void @giraffe(), !dbg [[A:!.*]] + // CHECK: call void @giraffe(){{( #[0-9]+)?}}, !dbg [[A:!.*]] giraffe(); // Column numbers use byte offests. Regression test for #67360 - // CHECK: call void @turtle(), !dbg [[B:!.*]] + // CHECK: call void @turtle(){{( #[0-9]+)?}}, !dbg [[B:!.*]] /* ż */ turtle(); // CHECK: [[A]] = !DILocation(line: 10, column: 9, |