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

Merged
merged 43 commits into from
Jan 10, 2023
Merged

Rollup of 9 pull requests #106656

merged 43 commits into from
Jan 10, 2023

Commits on Nov 28, 2022

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

Commits on Dec 13, 2022

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

Commits on Dec 14, 2022

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

Commits on Dec 27, 2022

  1. Configuration menu
    Copy the full SHA
    564435f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9e2536b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2404d6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    050bc95 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Configuration menu
    Copy the full SHA
    1296a4c View commit details
    Browse the repository at this point in the history
  2. Auto merge of rust-lang#2746 - RalfJung:retag-diagnostic, r=RalfJung

    tweaks to retag diagnostic handling
    
    Salvaged from rust-lang#106212
    bors committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    1010099 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Configuration menu
    Copy the full SHA
    99fc745 View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    d96592b View commit details
    Browse the repository at this point in the history
  3. clippy

    RalfJung committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    794cc08 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e1968dd View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Revert "bootstrap: Get rid of tail_args in stream_cargo"

    This reverts commit 9dfe504.
    
    Fixes `x clippy`.
    jyn514 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    23d3ee8 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Ignore symbol shim clash when symbol is provided by compiler_builtins

    When this happens, we ignore the symbol from `compiler_builtins`
    in favor of Miri's builtin support.
    
    This allows Miri to target platforms like wasm32-unknown-unknown,
    where functions like `memcmp` are provided by `compiler_builtins`.
    Aaron1011 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    54be8aa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a474872 View commit details
    Browse the repository at this point in the history
  3. Auto merge of rust-lang#2748 - Aaron1011:wasm32-support, r=RalfJung

    Ignore symbol shim clash when symbol is provided by compiler_builtins
    
    When this happens, we ignore the symbol from `compiler_builtins`
    in favor of Miri's builtin support.
    
    This allows Miri to target platforms like wasm32-unknown-unknown,
    where functions like `memcmp` are provided by `compiler_builtins`.
    bors committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    0f34039 View commit details
    Browse the repository at this point in the history
  4. Bump tokio from 1.23.0 to 1.23.1 in /test_dependencies

    Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1.
    - [Release notes](https://github.com/tokio-rs/tokio/releases)
    - [Commits](tokio-rs/tokio@tokio-1.23.0...tokio-1.23.1)
    
    ---
    updated-dependencies:
    - dependency-name: tokio
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 6, 2023
    Configuration menu
    Copy the full SHA
    90600e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Auto merge of rust-lang#2750 - rust-lang:dependabot/cargo/test_depend…

    …encies/tokio-1.23.1, r=oli-obk
    
    Bump tokio from 1.23.0 to 1.23.1 in /test_dependencies
    
    Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1.
    <details>
    <summary>Release notes</summary>
    <p><em>Sourced from <a href="https://github.com/tokio-rs/tokio/releases">tokio's releases</a>.</em></p>
    <blockquote>
    <h2>Tokio v1.23.1</h2>
    <p>This release forward ports changes from 1.18.4.</p>
    <h3>Fixed</h3>
    <ul>
    <li>net: fix Windows named pipe server builder to maintain option when toggling
    pipe mode (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5336">#5336</a>).</li>
    </ul>
    <p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5336">#5336</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/5336">tokio-rs/tokio#5336</a></p>
    </blockquote>
    </details>
    <details>
    <summary>Commits</summary>
    <ul>
    <li><a href="https://github.com/tokio-rs/tokio/commit/1a997ffbd62334af2553775234e75ede2d7d949f"><code>1a997ff</code></a> chore: prepare Tokio v1.23.1 release</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/a8fe333cc45c14b0566d450dff8ff85fbe974fa0"><code>a8fe333</code></a> Merge branch 'tokio-1.20.x' into tokio-1.23.x</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/ba81945ffc2695b71f2bbcadbfb5e46ec55aaef3"><code>ba81945</code></a> chore: prepare Tokio 1.20.3 release</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/763bdc967e3e128d1e6e000238f1d257a81bf59a"><code>763bdc9</code></a> ci: run WASI tasks using latest Rust</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/9f98535877f8f706b436447952f40f153e2a52dc"><code>9f98535</code></a> Merge remote-tracking branch 'origin/tokio-1.18.x' into fix-named-pipes-1.20</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/9241c3eddf4a6a218681b088d71f7191513e2376"><code>9241c3e</code></a> chore: prepare Tokio v1.18.4 release</li>
    <li><a href="https://github.com/tokio-rs/tokio/commit/699573d550fabf4bfb45d82505d6709faaae9037"><code>699573d</code></a> net: fix named pipes server configuration builder</li>
    <li>See full diff in <a href="https://github.com/tokio-rs/tokio/compare/tokio-1.23.0...tokio-1.23.1">compare view</a></li>
    </ul>
    </details>
    <br />
    
    [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.23.0&new-version=1.23.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
    
    Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
    
    [//]: # (dependabot-automerge-start)
    [//]: # (dependabot-automerge-end)
    
    ---
    
    <details>
    <summary>Dependabot commands and options</summary>
    <br />
    
    You can trigger Dependabot actions by commenting on this PR:
    - ``@dependabot` rebase` will rebase this PR
    - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
    - ``@dependabot` merge` will merge this PR after your CI passes on it
    - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
    - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
    - ``@dependabot` reopen` will reopen this PR if it is closed
    - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
    - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
    - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
    - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    - ``@dependabot` use these labels` will set the current labels as the default for future PRs for this repo and language
    - ``@dependabot` use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
    - ``@dependabot` use these assignees` will set the current assignees as the default for future PRs for this repo and language
    - ``@dependabot` use this milestone` will set the current milestone as the default for future PRs for this repo and language
    
    You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/rust-lang/miri/network/alerts).
    
    </details>
    bors committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c0f5dc8 View commit details
    Browse the repository at this point in the history
  2. Relocate changes

    HintringerFabian authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c364d32 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5977a16 View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#2752 - RalfJung:win-env-current-exe, r=RalfJung

    make env::current_exe work on Windows
    bors committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    87a202e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8740443 View commit details
    Browse the repository at this point in the history
  6. Merge from rustc

    RalfJung committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    236ae26 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d61d359 View commit details
    Browse the repository at this point in the history
  8. add dtors_in_dtors_in_dtors

    RalfJung committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    85e87a8 View commit details
    Browse the repository at this point in the history
  9. Auto merge of rust-lang#2755 - RalfJung:dtors_in_dtors_in_dtors, r=Ra…

    …lfJung
    
    add dtors_in_dtors_in_dtors
    
    That's a pretty neat test from the standard library. Sadly not enough to check for rust-lang/miri#2754, but still worth having here.
    bors committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    cb15925 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    31099ee View commit details
    Browse the repository at this point in the history
  11. Accept old spelling of Fuchsia target triples

    Because the old spelling is widely used, some projects may need time to
    migrate their uses to the new triple spelling. The old spelling may
    eventually be removed altogether.
    David Koloski committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    42aa075 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    5132e13 View commit details
    Browse the repository at this point in the history
  13. review comment

    compiler-errors committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    1d66a67 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    1c766d0 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f769d34 View commit details
    Browse the repository at this point in the history
  16. Add issue number to FIXMEs

    tmandry authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9c23629 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#105034 - HintringerFabian:improve_iterator_…

    …flatten_doc, r=cuviper
    
    Add example for iterator_flatten
    
    Adds an Example to iterator_flatten
    Fixes rust-lang#82687
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    002eccc View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#105708 - tomerze:enable-atomic-cas-bpf, r=n…

    …agisa
    
    Enable atomic cas for bpf targets
    
    It seems like LLVM now supports it.
    
    https://reviews.llvm.org/D72184 - the PR in LLVM
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    5773e8b View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#106175 - compiler-errors:bad-import-sugg, r…

    …=oli-obk
    
    Fix bad import suggestion with nested `use` tree
    
    Fixes rust-lang#105566
    Fixes rust-lang#105373
    
    Ideally, we'd find some way to turn these into structured suggestions -- perhaps on a separate line as a different `use` statement, but I have no idea how to access the span for the whole `use` from this point in the import resolution code.
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    684a371 View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#106204 - compiler-errors:no-take-opaques-in…

    …-compare, r=oli-obk
    
    No need to take opaques in `check_type_bounds`
    
    `InferCtxt` already has its defining use anchor set to err
    
    r? ``@oli-obk``
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    e5e116d View commit details
    Browse the repository at this point in the history
  21. Rollup merge of rust-lang#106387 - jyn514:clippy, r=Mark-Simulacrum

    Revert "bootstrap: Get rid of `tail_args` in `stream_cargo`"
    
    This reverts commit 9dfe504. (Note: that merged as part of rust-lang#106305, but rust-lang#106305 contains more commits than just 9dfe504.)
    
    Fixes `x clippy`. It turns out `clippy` was the only one using `tail_args` 🤦 sorry for not testing this earlier.
    
    r? `@Mark-Simulacrum`
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    b102673 View commit details
    Browse the repository at this point in the history
  22. Rollup merge of rust-lang#106636 - djkoloski:accept_old_fuchsia_tripl…

    …e, r=tmandry
    
    Accept old spelling of Fuchsia target triples
    
    The old spelling of Fuchsia target triples was changed in rust-lang#106429 to add a proper vendor. Because the old spelling is widely used, some projects may need time to migrate their uses to the new triple spelling. The old spelling may eventually be removed altogether.
    
    r? ``@tmandry``
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    96e53c0 View commit details
    Browse the repository at this point in the history
  23. Rollup merge of rust-lang#106639 - RalfJung:miri, r=RalfJung

    update Miri
    
    Notable PRs:
    - rust-lang/miri#2748
    - rust-lang/miri#2752
    
    r? `@ghost`
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    0ba27de View commit details
    Browse the repository at this point in the history
  24. Rollup merge of rust-lang#106640 - lcnr:update-test, r=jackh726

    update test for inductive canonical cycles
    
    the previous test always resulted in a cycle 😅 cc rust-lang/chalk#787.
    
    I checked with rust-lang#102713 and this is the only test which fails with that PR.
    
    r? ``@jackh726``
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9bed3d9 View commit details
    Browse the repository at this point in the history
  25. Rollup merge of rust-lang#106647 - notriddle:notriddle/a, r=Guillaume…

    …Gomez
    
    rustdoc: merge common CSS for `a`
    Yuki Okushi authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    ed840a6 View commit details
    Browse the repository at this point in the history