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 11 pull requests #85005

Closed
wants to merge 38 commits into from

Commits on Apr 21, 2021

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

Commits on Apr 29, 2021

  1. Use atomics in join_orders_after_tls_destructors test

    std::sync::mpsc uses thread locals and depending on the order TLS dtors
    are run `rx.recv()` can panic when used in a TLS dtor.
    mzohreva committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    8a0a4b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Add --run flag to compiletest

    This controls whether run-* tests actually get run.
    tmandry committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    051f9ec View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0978381 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0b2e908 View commit details
    Browse the repository at this point in the history
  4. Include --run in stamp hash

    tmandry committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    e282fd0 View commit details
    Browse the repository at this point in the history
  5. Add needs-run-enabled directive for should-fail tests

    I was wary of doing any automatic disabling here, since should-fail
    is how we test compiletest itself.
    tmandry committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    f64c45a View commit details
    Browse the repository at this point in the history
  6. Fix help for profile flags

    tmandry committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    1e46b18 View commit details
    Browse the repository at this point in the history
  7. Allow using core:: in intra-doc links within core itself

    I came up with this idea ages ago, but rustdoc used to ICE on it. Now it
    doesn't.
    jyn514 committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    4a63e1e View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Configuration menu
    Copy the full SHA
    d7cd6e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2fa18b8 View commit details
    Browse the repository at this point in the history
  3. Take build dependencies into account during license checks

    The comment says that build dependencies shouldn't matter unless they do
    some kind of codegen. It is safer to always check it though.
    bjorn3 committed May 3, 2021
    Configuration menu
    Copy the full SHA
    5db01aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    24def63 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. Configuration menu
    Copy the full SHA
    6b64202 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b94338 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. Disallows #![feature(no_coverage)] on stable and beta

    using allow_internal_unstable (as recommended)
    
    Fixes: rust-lang#84836
    
    ```shell
    $ ./build/x86_64-unknown-linux-gnu/stage1/bin/rustc     src/test/run-make-fulldeps/coverage/no_cov_crate.rs
    error[E0554]: `#![feature]` may not be used on the dev release channel
     --> src/test/run-make-fulldeps/coverage/no_cov_crate.rs:2:1
      |
    2 | #![feature(no_coverage)]
      | ^^^^^^^^^^^^^^^^^^^^^^^^
    
    error: aborting due to previous error
    
    For more information about this error, try `rustc --explain E0554`.
    ```
    richkadel committed May 5, 2021
    Configuration menu
    Copy the full SHA
    3584c1d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ad4ccf9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3c489a3 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Configuration menu
    Copy the full SHA
    568d9c5 View commit details
    Browse the repository at this point in the history
  2. Add needs-unwind to tests

    tmandry committed May 6, 2021
    Configuration menu
    Copy the full SHA
    e1a8ecf View commit details
    Browse the repository at this point in the history
  3. Support multi target-rustcflags for -Zpanic-abort-tests

    I just need this until rustbuild supports -Cpanic=abort std directly.
    tmandry committed May 6, 2021
    Configuration menu
    Copy the full SHA
    1993e1a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    947ad58 View commit details
    Browse the repository at this point in the history
  5. remove unused variant

    lcnr committed May 6, 2021
    Configuration menu
    Copy the full SHA
    513c56a View commit details
    Browse the repository at this point in the history
  6. outdated comment

    lcnr committed May 6, 2021
    Configuration menu
    Copy the full SHA
    b981141 View commit details
    Browse the repository at this point in the history
  7. move the current channel to src/ci/channel

    This will make it easier for tools to programmatically detect which
    channel CI is building.
    pietroalbini committed May 6, 2021
    Configuration menu
    Copy the full SHA
    81a97ce View commit details
    Browse the repository at this point in the history
  8. join_orders_after_tls_destructors: ensure thread 2 is launched before…

    … thread 1 enters TLS destructors
    mzohreva committed May 6, 2021
    Configuration menu
    Copy the full SHA
    2acd62d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    392723e View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#84409 - mzohreva:mz/tls-dtors-before-join, …

    …r=jethrogb
    
    Ensure TLS destructors run before thread joins in SGX
    
    The excellent test is from `@jethrogb`
    
    For context see: rust-lang#83416 (comment)
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    66421d9 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#84500 - tmandry:compiletest-run-flag, r=Mar…

    …k-Simulacrum
    
    Add --run flag to compiletest
    
    This controls whether run-* tests actually get run.
    
    r? `@Mark-Simulacrum`
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    4e2cc06 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#84734 - tmandry:compiletest-needs-unwind, r…

    …=Mark-Simulacrum
    
    Add `needs-unwind` and beginning of support for testing `panic=abort` std to compiletest
    
    For the Fuchsia platform we build libstd with `panic=abort` and would like a way to run tests with that enabled. This adds low-level support for this directly to compiletest.
    
    In the future I'd like to add high-level support in rustbuild, e.g. having target-specific flags that allow configuring a panic strategy. (Side note: It would be nice if we could also build multiple configurations for the same target, but I'm getting ahead of myself.)
    
    This plus rust-lang#84500 have everything that's needed to get ui tests passing on fuchsia targets.
    
    Part of rust-lang#84766. Note that this change only includes the header on tests which need an unwinder to _build_, not those which need it to _run_.
    
    r? ``@Mark-Simulacrum``
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    55afb6d View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#84755 - jyn514:core-links, r=kennytm

    Allow using `core::` in intra-doc links within core itself
    
    I came up with this idea ages ago, but rustdoc used to ICE on it. Now it doesn't.
    
    Helps with rust-lang#73445. Doesn't fix it completely since `extern crate self as std;` in std still gives strange errors.
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    b0af9ad View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#84871 - richkadel:no-coverage-unstable-only…

    …, r=nagisa
    
    Disallows `#![feature(no_coverage)]` on stable and beta (using standard crate-level gating)
    
    Fixes: rust-lang#84836
    
    Removes the function-level feature gating solution originally implemented, and solves the same problem using `allow_internal_unstable`, so normal crate-level feature gating mechanism can still be used (which disallows the feature on stable and beta).
    
    I tested this, building the compiler with and without `CFG_DISABLE_UNSTABLE_FEATURES=1`
    
    With unstable features disabled, I get the expected result as shown here:
    
    ```shell
    $ ./build/x86_64-unknown-linux-gnu/stage1/bin/rustc     src/test/run-make-fulldeps/coverage/no_cov_crate.rs
    error[E0554]: `#![feature]` may not be used on the dev release channel
     --> src/test/run-make-fulldeps/coverage/no_cov_crate.rs:2:1
      |
    2 | #![feature(no_coverage)]
      | ^^^^^^^^^^^^^^^^^^^^^^^^
    
    error: aborting due to previous error
    
    For more information about this error, try `rustc --explain E0554`.
    ```
    
    r? ``@Mark-Simulacrum``
    cc: ``@tmandry`` ``@wesleywiser``
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    52ffd21 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#84872 - bjorn3:cg_clif_tidy, r=Mark-Simulacrum

    Wire up tidy dependency checks for cg_clif
    
    Also contains a fix and improvement to tidy.
    
    Required for rust-lang#81746.
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    44f16f5 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#84896 - estebank:issue-84772, r=jackh726

    Handle incorrect placement of parentheses in trait bounds more gracefully
    
    Fix rust-lang#84772.
    
    CC ````@jonhoo````
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    4ddfff6 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#84905 - RalfJung:copy, r=oli-obk

    CTFE engine: rename copy → copy_intrinsic, move to intrinsics.rs
    
    The `copy` name is confusing for this function because we also have `copy_op` which is pretty different. I hope `copy_intrinsic` is clearer. Also `step.rs` should really just contain the main loop and opcode dispatch, so move this helper function to a more appropriate place.
    
    r? ````@oli-obk````
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    b96f14f View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#84953 - GuillaumeGomez:remove-unneeded-with…

    …_default_session_globals, r=jyn514
    
    Remove unneeded call to with_default_session_globals in rustdoc highlight
    
    This was the origin of the `Span` bug in rust-lang#84176.
    
    cc ```@Aaron1011```
    r? ```@jyn514```
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    37ac8c0 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    10e2891 View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#84997 - pietroalbini:ci-verify-channel, r=M…

    …ark-Simulacrum
    
    Error out if a PR is sent to the wrong channel
    
    It happened multiple times that a PR meant to go on beta ends up being opened (and occasionally merged) to master. This PR does two things:
    
    * Moves the definition of the channel in `src/ci/channel` so it's easier for tools to read it. I was not sure whether to move it to `src/channel` (like `src/version`): ended up with `src/ci` as it's currently only used for CI, but I'm open to moving it to `src`. We'll need to update the release process after this.
    * Adds a check on **non-bors** builds that errors out if the base branch is not the expected one for the currently defined channel. This will not cause problems for promotion PRs, as those PRs are meant to also update the channel name.
    
    r? `@Mark-Simulacrum`
    Dylan-DPC committed May 6, 2021
    Configuration menu
    Copy the full SHA
    4767faa View commit details
    Browse the repository at this point in the history