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 #89481

Closed
wants to merge 15 commits into from

Commits on Oct 1, 2021

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

Commits on Oct 2, 2021

  1. Consistently use 'supertrait'.

    A subset of places referred to 'super-trait', so this changes them
    to all use 'supertrait'. This matches 'supertype' and some other
    usages. An exception is 'auto-trait' which is consistently used
    in that manner.
    waywardmonkeys committed Oct 2, 2021
    Configuration menu
    Copy the full SHA
    058a21d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98dde56 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a73e39c View commit details
    Browse the repository at this point in the history
  4. Query the fingerprint style during key reconstruction

    Keys can be reconstructed from fingerprints that are not DefPathHash, but then
    we cannot extract a DefId from them.
    Mark-Simulacrum committed Oct 2, 2021
    Configuration menu
    Copy the full SHA
    0a82acc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    63aaf88 View commit details
    Browse the repository at this point in the history
  6. bootstrap: add config option for nix patching

    On NixOS systems, bootstrap will patch rustc used in bootstrapping after
    checking `/etc/os-release` (to confirm the current distribution is NixOS).
    However, when using Nix on a non-NixOS system, it can be desirable for
    bootstrap to patch rustc. In this commit, a `patch-binaries-for-nix`
    option is added to `config.toml`, which allows for user opt-in to
    bootstrap's Nix patching.
    
    Signed-off-by: David Wood <david.wood@huawei.com>
    davidtwco committed Oct 2, 2021
    Configuration menu
    Copy the full SHA
    e552c0d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d1def47 View commit details
    Browse the repository at this point in the history
  8. Do not ICE if some foreign expansions were not encoded.

    The metadata encoder does not necessarily encode all expansions, only
    those which are referenced in other metadata fields.
    cjgillot committed Oct 2, 2021
    Configuration menu
    Copy the full SHA
    f3e6d03 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2021

  1. Rollup merge of rust-lang#89343 - Mark-Simulacrum:no-args-queries, r=…

    …cjgillot
    
    Refactor fingerprint reconstruction
    
    This PR replaces can_reconstruct_query_key with fingerprint_style, which returns the style of the fingerprint for that query. This allows us to avoid trying to extract a DefId (or equivalent) from keys which *are* reconstructible because they're () but not as DefIds.
    
    This is done with the goal of fixing -Zdump-dep-graph, which seems to have broken a while ago (I didn't try to bisect). Currently even on a `fn main() {}` file it'll ICE (you need to also pass -Zquery-dep-graph for it to work at all), and this patch indirectly fixes the cause of that ICE. This also adds a test for it continuing to work.
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    e984be9 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#89426 - davidtwco:bootstrap-nix-toolchain-e…

    …nv-var, r=Mark-Simulacrum
    
    bootstrap: add config option for nix patching
    
    On NixOS systems, bootstrap will patch rustc used in bootstrapping after checking `/etc/os-release` (to confirm the current distribution is NixOS). However, when using Nix on a non-NixOS system, it can be desirable for bootstrap to patch rustc. In this commit, a `patch-binaries-for-nix` option is added to `config.toml`, which allows for user opt-in to bootstrap's Nix patching.
    
    r? `@Mark-Simulacrum`
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    d5e4714 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#89444 - notriddle:notriddle/contains-str, r…

    …=jyn514
    
    rustdoc: use slice::contains instead of open-coding it
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    8daa0f7 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#89453 - waywardmonkeys:consistent-supertrai…

    …t-usage, r=nagisa
    
    Consistently use 'supertrait'.
    
    A subset of places referred to 'super-trait', so this changes them
    to all use 'supertrait'. This matches 'supertype' and some other
    usages. An exception is 'auto-trait' which is consistently used
    in that manner.
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    90072f9 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#89462 - devnexen:haiku_thread_aff_build_fix…

    …, r=nagisa
    
    haiku thread affinity build fix
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    2cb53ab View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#89476 - cjgillot:expn-id, r=petrochenkov

    Correct decoding of foreign expansions during incr. comp.
    
    Fixes rust-lang#74946
    
    The original issue was due to a wrong assertion in `expn_hash_to_expn_id`.
    
    The secondary issue was due to a mismatch between the encoding and decoding paths for expansions that are created after the TyCtxt is created.
    Manishearth authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    dd79e4c View commit details
    Browse the repository at this point in the history