Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #119745

Closed
wants to merge 18 commits into from

Commits on Jan 6, 2024

  1. Configuration menu
    Copy the full SHA
    4292190 View commit details
    Browse the repository at this point in the history
  2. 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.
    petrochenkov committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    c51828a View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. coverage: Anonymize line numbers in branch views

    The code for anonymizing line numbers in coverage reports now supports the
    slightly different line number syntax used by branch regions.
    Zalathar committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    957a46f View commit details
    Browse the repository at this point in the history
  2. 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.
    nnethercote committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    74f5d51 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Configuration menu
    Copy the full SHA
    e651f6f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    75df38e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    585a285 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    88f5759 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f2dbeba View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6971e93 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#118903 - azhogin:azhogin/skip_second_stmt_d…

    …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
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    f6e4cb7 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#119033 - Zalathar:unicode, r=davidtwco

    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.)
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    c3a3e02 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#119660 - RalfJung:const-ub-enum, r=oli-obk

    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``
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    cf0a620 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#119663 - petrochenkov:rmakefix, r=Mark-Simu…

    …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.
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    87d8b90 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#119681 - Zalathar:anon-branch, r=clubby789

    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.)
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a5d2833 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#119704 - chenyukang:yukang-fix-let_undersco…

    …re, r=Nilstrieb
    
    Fix two variable binding issues in lint let_underscore
    
    Fixes rust-lang#119696
    Fixes rust-lang#119697
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    abafcab View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#119723 - nnethercote:rm-Zdont-buffer-diagno…

    …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`
    matthiaskrgr authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    b8d476b View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#119725 - compiler-errors:has_effect_param, …

    …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 authored Jan 8, 2024
    Configuration menu
    Copy the full SHA
    ba002be View commit details
    Browse the repository at this point in the history