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 9 pull requests #85022

Merged
merged 20 commits into from
May 7, 2021
Merged

Rollup of 9 pull requests #85022

merged 20 commits into from
May 7, 2021

Commits on May 1, 2021

  1. Add support for --test-args to cargotest

    This allows running a single test without having to wait for all tests
    to complete.
    jyn514 committed May 1, 2021
    Configuration menu
    Copy the full SHA
    d95a6cf View commit details
    Browse the repository at this point in the history
  2. Don't check bootstrap artifacts by default

    Bootstrap has to build successfully or this won't run, so all it checks
    are the tests, which are uncommon to change.
    jyn514 committed May 1, 2021
    Configuration menu
    Copy the full SHA
    3b4b1ea View commit details
    Browse the repository at this point in the history
  3. bump deps

    klensy committed May 1, 2021
    Configuration menu
    Copy the full SHA
    50c3890 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. Retry clang+llvm download

    We've been seeing a pretty high rate of spurious network failures (e.g., openssl
    connection reset by peer). Not clear why, but let's add a retry.
    Mark-Simulacrum committed May 4, 2021
    Configuration menu
    Copy the full SHA
    aa68ec2 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Configuration menu
    Copy the full SHA
    abdba81 View commit details
    Browse the repository at this point in the history
  2. 32bit bless

    RalfJung committed May 6, 2021
    Configuration menu
    Copy the full SHA
    bcf622b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cdbfea5 View commit details
    Browse the repository at this point in the history
  4. Coverage instruments closure bodies in macros (not the macro body)

    Fixes: rust-lang#84884
    
    This solution might be considered a compromise, but I think it is the
    better choice.
    
    The results in the `closure.rs` test correctly resolve all test cases
    broken as described in rust-lang#84884.
    
    One test pattern (in both `closure_macro.rs` and
    `closure_macro_async.rs`) was also affected, and removes coverage
    statistics for the lines inside the closure, because the closure
    includes a macro. (The coverage remains at the callsite of the macro, so
    we lose some detail, but there isn't a perfect choice with macros.
    
    Often macro implementations are split across the macro and the callsite,
    and there doesn't appear to be a single "right choice" for which body
    should be covered. For the current implementation, we can't do both.
    
    The callsite is most likely to be the preferred site for coverage.
    
    I applied this fix to all `MacroKinds`, not just `Bang`.
    
    I'm trying to resolve an issue of lost coverage in a
    `MacroKind::Attr`-based, function-scoped macro. Instead of only
    searching for a body_span that is "not a function-like macro" (that is,
    MacroKind::Bang), I'm expanding this to all `MacroKind`s. Maybe I should
    expand this to `ExpnKind::Desugaring` and `ExpnKind::AstPass` (or
    subsets, depending on their sub-kinds) as well, but I'm not sure that's
    a good idea.
    
    I'd like to add a test of the `Attr` macro on functions, but I need time
    to figure out how to constract a good, simple example without external
    crate dependencies. For the moment, all tests still work as expected (no
    change), this new commit shouldn't have a negative affect, and more
    importantly, I believe it will have a positive effect. I will try to
    confirm this.
    richkadel committed May 6, 2021
    Configuration menu
    Copy the full SHA
    cb70221 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f58a362 View commit details
    Browse the repository at this point in the history
  6. Renamed compiler-flags file to name of compiler-flag: instrument-cove…

    …rage
    
    And redirect users from the old file name.
    richkadel committed May 6, 2021
    Configuration menu
    Copy the full SHA
    8075b28 View commit details
    Browse the repository at this point in the history
  7. Removes unneeded check of #[no_coverage] in mapgen

    And adds tests to validate it still works.
    
    There is an anticipated feature request to support a compiler flag that
    only adds coverage for specific files (or perhaps mods). As I thought
    about where that change would need to be supported, I realized that
    checking the attribute in mapgen (for unused functions) was unnecessary.
    The unused functions are only synthesized if they have MIR coverage, and
    functions with the `no_coverage` attribute will not have been
    instrumented with MIR coverage statements in the first place.
    
    New tests confirm this.
    
    Also, while adding tests, I updated resolved comments and FIXMEs in
    other tests.
    richkadel committed May 6, 2021
    Configuration menu
    Copy the full SHA
    cd3a8c1 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Rollup merge of rust-lang#84779 - jyn514:cargotest-args, r=Mark-Simul…

    …acrum
    
    Add support for --test-args to cargotest
    
    This allows running a single test without having to wait for all tests
    to complete.
    
    Closes rust-lang#77260.
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    2d496f4 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#84781 - jyn514:check-bootstrap, r=Mark-Simu…

    …lacrum
    
    Don't check bootstrap artifacts by default
    
    Bootstrap has to build successfully or this won't run, so all it checks
    are the tests, which are uncommon to change.
    
    Fixes rust-lang#76624.
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    1224e13 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#84787 - klensy:deps-bump, r=Mark-Simulacrum

    bump deps
    
    openssl vulns:
    https://rustsec.org/advisories/RUSTSEC-2021-0056.html
    https://rustsec.org/advisories/RUSTSEC-2021-0055.html
    
    openssl-src v111.12.0+1.1.1h -> v111.15.0+1.1.1k
    
    not latest, but newer
    openssl-sys v0.9.58 -> v0.9.61
    openssl v0.10.30 -> v0.10.33
    
    curl vulns: https://curl.se/docs/vuln-7.74.0.html
    
    curl v0.4.34 -> v0.4.36
    curl-sys v0.4.39+curl-7.74.0 -> v0.4.42+curl-7.76.0
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    246e8d1 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#84815 - richkadel:coverage-docs-update-2021…

    …-05, r=tmandry
    
    Update coverage docs and command line help
    
    r? `@tmandry`
    cc: `@wesleywiser`
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    283ef86 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#84875 - richkadel:no-coverage-dont-check-un…

    …used, r=tmandry
    
    Removes unneeded check of `#[no_coverage]` in mapgen
    
    There is an anticipated feature request to support a compiler flag that
    only adds coverage for specific files (or perhaps mods). As I thought
    about where that change would need to be supported, I realized that
    checking the attribute in mapgen (for unused functions) was unnecessary.
    The unused functions are only synthesized if they have MIR coverage, and
    functions with the `no_coverage` attribute will not have been
    instrumented with MIR coverage statements in the first place.
    
    New tests confirm this.
    
    Also, while adding tests, I updated resolved comments and FIXMEs in
    other tests, and expanded comments and tests on one remaining issue that
    is still not resolved.
    
    r? `@tmandry`
    cc: `@wesleywiser`
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    b088318 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#84897 - richkadel:cover-closure-macros, r=t…

    …mandry
    
    Coverage instruments closure bodies in macros (not the macro body)
    
    Fixes: rust-lang#84884
    
    This solution might be considered a compromise, but I think it is the
    better choice.
    
    The results in the `closure.rs` test correctly resolve all test cases
    broken as described in rust-lang#84884.
    
    One test pattern (in both `closure_macro.rs` and
    `closure_macro_async.rs`) was also affected, and removes coverage
    statistics for the lines inside the closure, because the closure
    includes a macro. (The coverage remains at the callsite of the macro, so
    we lose some detail, but there isn't a perfect choice with macros.
    
    Often macro implementations are split across the macro and the callsite,
    and there doesn't appear to be a single "right choice" for which body
    should be covered. For the current implementation, we can't do both.
    
    The callsite is most likely to be the preferred site for coverage.
    
    r? `@tmandry`
    cc: `@wesleywiser`
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    343a094 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#84911 - Mark-Simulacrum:retry-clang, r=piet…

    …roalbini
    
    Retry clang+llvm download
    
    We've been seeing a pretty high rate of spurious network failures (e.g., openssl
    connection reset by peer). Not clear why, but let's add a retry.
    
    r? `@pietroalbini`
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    326fec2 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#84972 - RalfJung:null-ptr-msg, r=oli-obk

    CTFE inbounds-error-messages tweak
    
    * use CheckInAllocMsg::PointerArithmeticTest for ptr_offset error
    * nicer errors for some null pointer cases
    
    r? `@oli-obk`
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    4705027 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#84990 - GuillaumeGomez:sort-rustdoc-gui-tes…

    …ts, r=Mark-Simulacrum
    
    Sort rustdoc-gui tests
    
    The rustdoc-gui tests were randomly run. Not really a big issue but I prefer the tests to be sorted.
    JohnTitor committed May 7, 2021
    Configuration menu
    Copy the full SHA
    87faf2e View commit details
    Browse the repository at this point in the history