Rollup of 8 pull requests #119745

matthiaskrgr · 2024-01-08T16:17:01Z

Successful merges:

Improved support of collapse_debuginfo attribute for macros. #118903 (Improved support of collapse_debuginfo attribute for macros.)
coverage: llvm-cov expects column numbers to be bytes, not code points #119033 (coverage: llvm-cov expects column numbers to be bytes, not code points)
remove an unnecessary stderr-per-bitwidth #119660 (remove an unnecessary stderr-per-bitwidth)
tests: Normalize \r\n to \n in some run-make tests #119663 (tests: Normalize \r\n to \n in some run-make tests)
coverage: Anonymize line numbers in branch views #119681 (coverage: Anonymize line numbers in branch views)
Fix two variable binding issues in lint let_underscore #119704 (Fix two variable binding issues in lint let_underscore)
Remove -Zdont-buffer-diagnostics. #119723 (Remove -Zdont-buffer-diagnostics.)
Add helper for when we want to know if an item has a host param #119725 (Add helper for when we want to know if an item has a host param)

r? @ghost
@rustbot modify labels: rollup

The output is produced by printf from C code in these cases, and printf prints in text mode, which means `\n` will be printed as `\r\n` on Windows. In --bless mode the new output with `\r\n` will replace expected output in `tests/run-make/raw-dylib-*\output.txt` files, which use \n, always resulting in dirty files in the repo.

The code for anonymizing line numbers in coverage reports now supports the slightly different line number syntax used by branch regions.

It was added in rust-lang#54232. It seems like it was aimed at NLL development, which is well in the past. Also, it looks like `-Ztreat-err-as-bug` can be used to achieve the same effect. So it doesn't seem necessary.

…ebuginfo.rs, r=petrochenkov Improved support of collapse_debuginfo attribute for macros. Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain. Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap). cc rust-lang#100758

coverage: `llvm-cov` expects column numbers to be bytes, not code points Normally the compiler emits column numbers as a 1-based number of Unicode code points. But when we embed coverage mappings for `-Cinstrument-coverage`, those mappings will ultimately be read by the `llvm-cov` tool. That tool assumes that column numbers are 1-based numbers of *bytes*, and relies on that assumption when slicing up source code to apply highlighting (in HTML reports, and in text-based reports with colour). For the very common case of all-ASCII source code, bytes and code points are the same, so the difference isn't noticeable. But for code that contains non-ASCII characters, emitting column numbers as code points will result in `llvm-cov` slicing strings in the wrong places, producing mangled output or fatal errors. (See taiki-e/cargo-llvm-cov#275 as an example of what can go wrong.)

remove an unnecessary stderr-per-bitwidth also update some regexp, `a(lloc)?` would no longer match now that we have compiletest itself do alloc ID normalization. r? ``@oli-obk``

…lacrum tests: Normalize `\r\n` to `\n` in some run-make tests The output is produced by printf from C code in these cases, and printf prints in text mode, which means `\n` will be printed as `\r\n` on Windows. In --bless mode the new output with `\r\n` will replace expected output in `tests/run-make/raw-dylib-*\output.txt` files, which use \n, always resulting in dirty files in the repo.

coverage: Anonymize line numbers in branch views Extracted from rust-lang#118305, as this is now the only part of that PR that needs to touch compiletest. --- Coverage tests run the `llvm-cov` tool to generate a coverage report for a test program, and then compare the report against a known-good snapshot. We use the `anonymize_coverage_line_numbers` function to replace line numbers in coverage reports with `LL`, so that they are less sensitive to lines being added or removed. This PR augments the existing code by making it also support the slightly different line number syntax used when reporting branch regions. Currently the compiler never emits branch regions, so there is no way to write a coverage test that makes use of this new capability. Instead, I've added a unit test that checks against some sample reports taken from rust-lang#118305. That unit test can be removed when some form of branch coverage support gets merged, and real branch coverage tests are added to the coverage test suite. (I have also manually tested this change as part of my draft branch-coverage PR.)

…re, r=Nilstrieb Fix two variable binding issues in lint let_underscore Fixes rust-lang#119696 Fixes rust-lang#119697

…stics, r=compiler-errors Remove `-Zdont-buffer-diagnostics`. It was added in rust-lang#54232. It seems like it was aimed at NLL development, which is well in the past. Also, it looks like `-Ztreat-err-as-bug` can be used to achieve the same effect. So it doesn't seem necessary. r? `@pnkfelix`

…r=fmease Add helper for when we want to know if an item has a host param r? ``@fmease`` since you're a good reviewer and no good deed goes unpunished This helper will see far more usages as built-in traits get constified.

matthiaskrgr · 2024-01-08T16:17:32Z

@bors r+ rollup=never p=8

bors · 2024-01-08T16:17:34Z

📌 Commit ba002be has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-08T18:24:00Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-q0bjgii (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-q0bjgii --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/ui/consts/const-eval/ub-enum.64bit.stderr
Auto-merging compiler/rustc_middle/src/ty/util.rs
Auto-merging compiler/rustc_hir_typeck/src/callee.rs
Auto-merging compiler/rustc_errors/src/lib.rs
Auto-merging compiler/rustc_errors/src/diagnostic_builder.rs
CONFLICT (content): Merge conflict in compiler/rustc_errors/src/diagnostic_builder.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-01-08T19:28:44Z

☔ The latest upstream changes (presumably #119606) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung and others added 18 commits January 6, 2024 14:54

remove an unnecessary stderr-per-bitwidth

4292190

coverage: Anonymize line numbers in branch views

957a46f

The code for anonymizing line numbers in coverage reports now supports the slightly different line number syntax used by branch regions.

Remove -Zdont-buffer-diagnostics.

74f5d51

It was added in rust-lang#54232. It seems like it was aimed at NLL development, which is well in the past. Also, it looks like `-Ztreat-err-as-bug` can be used to achieve the same effect. So it doesn't seem necessary.

Add helper for when we want to know if an item has a host param

e651f6f

Fix 2 variable binding issues in let_underscore

75df38e

coverage: Test for column numbers involving non-ASCII characters

585a285

coverage: Allow make_code_region to fail

88f5759

Improved support of collapse_debuginfo attribute for macros.

f2dbeba

coverage: llvm-cov expects column numbers to be bytes, not code points

6971e93

Rollup merge of rust-lang#119660 - RalfJung:const-ub-enum, r=oli-obk

cf0a620

remove an unnecessary stderr-per-bitwidth also update some regexp, `a(lloc)?` would no longer match now that we have compiletest itself do alloc ID normalization. r? ``@oli-obk``

Rollup merge of rust-lang#119704 - chenyukang:yukang-fix-let_undersco…

abafcab

…re, r=Nilstrieb Fix two variable binding issues in lint let_underscore Fixes rust-lang#119696 Fixes rust-lang#119697

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 8, 2024

matthiaskrgr closed this Jan 8, 2024

matthiaskrgr deleted the rollup-q0bjgii branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #119745

Rollup of 8 pull requests #119745

matthiaskrgr commented Jan 8, 2024

matthiaskrgr commented Jan 8, 2024

bors commented Jan 8, 2024

bors commented Jan 8, 2024

bors commented Jan 8, 2024

Rollup of 8 pull requests #119745

Rollup of 8 pull requests #119745

Conversation

matthiaskrgr commented Jan 8, 2024

matthiaskrgr commented Jan 8, 2024

bors commented Jan 8, 2024

bors commented Jan 8, 2024

bors commented Jan 8, 2024