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 14 pull requests #87413

Merged
merged 32 commits into from
Jul 23, 2021
Merged

Rollup of 14 pull requests #87413

merged 32 commits into from
Jul 23, 2021

Commits on Jul 1, 2021

  1. Document iteration order of retain functions

    For `HashSet` and `HashMap`, this simply copies the comment from
    `BinaryHeap::retain`.
    
    For `BTreeSet` and `BTreeMap`, this adds an additional guarantee that
    wasn't previously documented. I think that because these data structures
    are inherently ordered and other functions guarantee ordered iteration,
    it makes sense to provide this guarantee for `retain` as well.
    janikrabe committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    2dd69aa View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

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

Commits on Jul 16, 2021

  1. Configuration menu
    Copy the full SHA
    3c384ce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15a2e48 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    24254d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2021

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

Commits on Jul 19, 2021

  1. add testcase for 87076

    using
    rust-lang#87076 (comment) as
    testcase
    hellow554 committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    7df0327 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    05217d5 View commit details
    Browse the repository at this point in the history
  3. add --codegen-backends=foo,bar ./configure flag

    Unfortunately this requires a proper ./configure flag, as the codegen
    backends config entry is a list, not a string (breaking --set).
    pietroalbini committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    f63c805 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Fix --dry-run when download-ci-llvm is set

    Previously it would error out:
    
    ```
    $ x check --dry-run
    thread 'main' panicked at 'std::fs::read_to_string(ci_llvm.join("link-type.txt")) failed with No such file or directory (os error 2) ("CI llvm missing: /home/joshua/rustc3/build/tmp-dry-run/x86_64-unknown-linux-gnu/ci-llvm")', src/bootstrap/config.rs:795:33
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    Build completed unsuccessfully in 0:00:10
    ```
    jyn514 committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    a02756c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6194cc8 View commit details
    Browse the repository at this point in the history
  3. Remove Option from BufWriter

    Alexendoo committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    8837bf1 View commit details
    Browse the repository at this point in the history
  4. Squash all commits.

    add test for issue 86507
    
    add stderr for issue 86507
    
    update issue-86507 UI test
    
    add comment for the expected error in UI test file
    
    add proper 'refers to <ref_type>' in suggestion
    
    update diagnostic phrasing; update test to match new phrasing; re-organize logic for checking T: Sync
    
    evaluate additional obligation to figure out if T is Sync
    
    run './x.py test tidy --bless'
    
    incorporate changes from review; reorganize logic for readability
    chazkiker2 committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    831ac19 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. Configuration menu
    Copy the full SHA
    327eef9 View commit details
    Browse the repository at this point in the history
  2. Add VecMap::get_value_matching and assert if > 1 element

    Otherwise is a bug that we want to uncover.
    spastorino committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d714107 View commit details
    Browse the repository at this point in the history
  3. Add ConstraintLocator docs

    spastorino committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    c79df85 View commit details
    Browse the repository at this point in the history
  4. Add missing article

    wooster0 authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    97721a1 View commit details
    Browse the repository at this point in the history
  5. update clippy ui test 'future_not_send.stderr' to match

    the new diagnostic messages
    chazkiker2 committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    a1518f0 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#86410 - spastorino:get_value_matching, r=ol…

    …i-obk
    
    VecMap::get_value_matching should return just one element
    
    r? `@nikomatsakis`
    
    Related to rust-lang#86465 and rust-lang#87287
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    d453290 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#86790 - janikrabe:retain-iter-order-doc, r=…

    …m-ou-se
    
    Document iteration order of `retain` functions
    
    For `HashSet` and `HashMap`, this simply copies the comment from
    `BinaryHeap::retain`.
    
    For `BTreeSet` and `BTreeMap`, this adds an additional guarantee that
    wasn't previously documented. I think that because these data structures
    are inherently ordered and other functions guarantee ordered iteration,
    it makes sense to provide this guarantee for `retain` as well.
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    249a11f View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#87171 - Alexendoo:bufwriter-option, r=Mark-…

    …Simulacrum
    
    Remove Option from BufWriter
    
    Fixes rust-lang#72925
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    2038fa5 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#87175 - inquisitivecrystal:inner-error, r=k…

    …ennytm
    
    Stabilize `into_parts()` and `into_error()`
    
    This stabilizes `IntoInnerError`'s `into_parts()` and `into_error()` methods, currently gated behind the `io_into_inner_error_parts` feature. The FCP has [already completed.](rust-lang#79704 (comment))
    
    Closes rust-lang#79704.
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    f335bca View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#87185 - waterlens:issue-86499-fix, r=Mark-S…

    …imulacrum
    
    Fix panics on Windows when the build was cancelled
    
    Fixes rust-lang#86499
    
    cc `@jyn514`
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    ba869da View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#87191 - adamgemmell:dev/llvm-lib-package, r…

    …=Mark-Simulacrum
    
    Package LLVM libs for the target rather than the build host
    
    Fixes rust-lang#85250
    
    `dist.rs` uses, in the `rust-dev` stage, `llvm-config --libfiles` to get a list of the LLVM library files built but of course only for the build host. If the target differs we want to package lib files from the target's build tree instead. This is done by splitting/rejoining the paths on their build directories.
    
    At the moment `tree` on the LLVM build directories seems to give almost identical output, but of course this might not be the case in the future. If a file is missing in the target's build tree then this stage will error in the `builder.install()` call. If the target build tree has an extra file then it silently won't be copied and we'll get a linker error when building using this artifact (via `download-ci-llvm = "if-available"`), though we would have received a linker error anyway without this change.
    
    There was also a typo in the example config around this option.
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    aca83f1 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#87255 - RalfJung:miri-test-libcore, r=Mark-…

    …Simulacrum
    
    better support for running libcore tests with Miri
    
    See rust-lang/miri-test-libstd#4 for a description of the problem that this fixes.
    Thanks to `@hyd-dev` for suggesting this patch!
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    1a2b90b View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#87266 - hellow554:issue87076, r=Mark-Simula…

    …crum
    
    Add testcase for 87076
    
    Closes rust-lang#87076
    
    I also moved the issue tests into the issues subfolder, nothing changed there.
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    8b89c32 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#87283 - pietroalbini:configure-codegen-back…

    …ends, r=Mark-Simulacrum
    
    Add `--codegen-backends=foo,bar` configure flag
    
    Unfortunately this requires a proper `./configure` flag, as the codegen backends config entry is a list, not a string (breaking `--set`).
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    82a14e5 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#87322 - chazkiker2:fix/suggestion-ref-sync-…

    …send, r=estebank
    
    fix: clarify suggestion that `&T` must refer to `T: Sync` for `&T: Send`
    
    ### Description
    
    - [x] fix rust-lang#86507
    - [x] add UI test for relevant code from issue
    - [x] change `rustc_trait_selection/src/traits/error_reporting/suggestions.rs` to include a more clear suggestion when `&T` fails to satisfy `Send` bounds due to the fact that `T` fails to implement `Sync`
    - [x] update UI test in Clippy: `src/tools/tests/ui/future_not_send.stderr`
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    3fc79fd View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#87358 - jyn514:dry-run, r=Mark-Simulacrum

    Fix `--dry-run` when download-ci-llvm is set
    
    Previously it would error out:
    
    ```
    $ x check --dry-run
    thread 'main' panicked at 'std::fs::read_to_string(ci_llvm.join("link-type.txt")) failed with No such file or directory (os error 2) ("CI llvm missing: /home/joshua/rustc3/build/tmp-dry-run/x86_64-unknown-linux-gnu/ci-llvm")', src/bootstrap/config.rs:795:33
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    Build completed unsuccessfully in 0:00:10
    ```
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    1b9cd8b View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#87380 - jyn514:smarter-submodule-defaults, …

    …r=Mark-Simulacrum
    
    Don't default to `submodules = true` unless the rust repo has a .git directory
    
    Should hopefully fix rust-lang#82653 (comment) - `@semarie` can you confirm?
    
    r? `@Mark-Simulacrum`
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    f709999 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#87398 - GuillaumeGomez:test-font-module-ite…

    …ms, r=notriddle
    
    Add test for fonts used for module items
    
    Fixes rust-lang#85632.
    
    r? `@notriddle`
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    57ea2d8 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#87412 - r00ster91:patch-13, r=Mark-Simulacrum

    Add missing article
    
    Redo of rust-lang#87305. I messed up in that PR and wasn't sure how to fix it.
    JohnTitor authored Jul 23, 2021
    Configuration menu
    Copy the full SHA
    a651581 View commit details
    Browse the repository at this point in the history