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 6 pull requests #80055

Merged
merged 14 commits into from
Dec 15, 2020
Merged

Rollup of 6 pull requests #80055

merged 14 commits into from
Dec 15, 2020

Commits on Nov 24, 2020

  1. Configuration menu
    Copy the full SHA
    9b09dc0 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. Configuration menu
    Copy the full SHA
    99df340 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2020

  1. Fixes reported bugs in Rust Coverage

    Fixes: rust-lang#79569
    
    Fixes: rust-lang#79566
    Fixes: rust-lang#79565
    
    For the first issue (rust-lang#79569), I got hit a `debug_assert!()` before
    encountering the reported error message (because I have `debug = true`
    enabled in my config.toml).
    
    The assertion showed me that some `SwitchInt`s can have more than one
    target pointing to the same `BasicBlock`.
    
    I had thought that was invalid, but since it seems to be possible, I'm
    allowing this now.
    
    I added a new test for this.
    
    ----
    
    In the last two cases above, both tests (intentionally) fail to compile,
    but the `InstrumentCoverage` pass is invoked anyway.
    
    The MIR starts with an `Unreachable` `BasicBlock`, which I hadn't
    encountered before. (I had assumed the `InstrumentCoverage` pass
    would only be invoked with MIRs from successful compilations.)
    
    I don't have test infrastructure set up to test coverage on files that
    fail to compile, so I didn't add a new test.
    richkadel committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    eb963ff View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2020

  1. Fix cargo-binutils link

    EFanZh authored Dec 13, 2020
    Configuration menu
    Copy the full SHA
    7662626 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c1addf View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. Configuration menu
    Copy the full SHA
    becd0e8 View commit details
    Browse the repository at this point in the history
  2. Improve warnings on incompatible options involving -Zinstrument-coverage

    Adds checks for:
    
    * `no_core` attribute
    * explicitly-enabled `legacy` symbol mangling
    * mir_opt_level > 1 (which enables inlining)
    
    I removed code from the `Inline` MIR pass that forcibly disabled
    inlining if `-Zinstrument-coverage` was set. The default `mir_opt_level`
    does not enable inlining anyway. But if the level is explicitly set and
    is greater than 1, I issue a warning.
    
    The new warnings show up in tests, which is much better for diagnosing
    potential option conflicts in these cases.
    richkadel committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    4f550f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Convenience funcs for some_option.unwrap_or(...)

    This ensures consistent handling of default values for options that are
    None if not specified on the command line.
    richkadel committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    36c639a View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#79379 - GuillaumeGomez:no-js-not-hidden, r=…

    …Nemo157
    
    Show hidden elements by default when JS is disabled
    
    Fixes  rust-lang#79301.
    
    A lot of things are hidden by default which shouldn't when JS is disabled. This PR fixes it.
    
    Before:
    
    ![Screenshot from 2020-11-24 14-10-16](https://user-images.githubusercontent.com/3050060/100099361-a16d5580-2e5f-11eb-891b-a4c005aeb1d0.png)
    
    After:
    
    ![after](https://user-images.githubusercontent.com/3050060/100099382-a6caa000-2e5f-11eb-8190-14f330aff9a2.png)
    
    r? `@jyn514`
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    275599d View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#79796 - GuillaumeGomez:hide-associated-cons…

    …t-when-collapsing, r=jyn514
    
    Hide associated constants too when collapsing implementation
    
    Fixes rust-lang#71849.
    
    r? `@jyn514`
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    bfe49a0 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#79958 - richkadel:llvm-coverage-counters-2.…

    …2.0, r=tmandry
    
    Fixes reported bugs in Rust Coverage
    
    Fixes: rust-lang#79569
    
    Fixes: rust-lang#79566
    Fixes: rust-lang#79565
    
    For the first issue (rust-lang#79569), I got hit a `debug_assert!()` before
    encountering the reported error message (because I have `debug = true`
    enabled in my config.toml).
    
    The assertion showed me that some `SwitchInt`s can have more than one
    target pointing to the same `BasicBlock`.
    
    I had thought that was invalid, but since it seems to be possible, I'm
    allowing this now.
    
    I added a new test for this.
    
    ----
    
    In the last two cases above, both tests (intentionally) fail to compile,
    but the `InstrumentCoverage` pass is invoked anyway.
    
    The MIR starts with an `Unreachable` `BasicBlock`, which I hadn't
    encountered before. (I had assumed the `InstrumentCoverage` pass
    would only be invoked with MIRs from successful compilations.)
    
    I don't have test infrastructure set up to test coverage on files that
    fail to compile, so I didn't add a new test.
    
    r? `@tmandry`
    FYI: `@wesleywiser`
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    5de0c5f View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#80008 - EFanZh:patch-1, r=GuillaumeGomez

    Fix `cargo-binutils` link
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    a2fcdc4 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#80016 - jyn514:imports, r=GuillaumeGomez

    Use imports instead of rewriting the type signature of `RustcOptGroup::stable`
    
    This was an adventure; see https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/'higher.20ranked.20subtype.20error'
    
    r? `@GuillaumeGomez`
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    6990419 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#80025 - JohnTitor:tidy-error, r=Mark-Simula…

    …crum
    
    Replace some `println!` with `tidy_error!` to simplify
    GuillaumeGomez authored Dec 15, 2020
    Configuration menu
    Copy the full SHA
    0dcf99b View commit details
    Browse the repository at this point in the history