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.

Sign up for GitHub

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

Jump to bottom

[beta] backports #81774

Merged
merged 10 commits into from
Feb 6, 2021
Merged

[beta] backports #81774

merged 10 commits into from
Feb 6, 2021

Commits on Feb 5, 2021

  1. Auto merge of rust-lang#81762 - pietroalbini:fix-install-msys2, r=m-o… 

    …u-se

CI: only copy python.exe to python3.exe if the latter does not exist

We're copying the binary to make sure we can call `python3.exe` around, but it seems like the base image of GitHub Actions changed, copying the file before we do so. This PR changes the CI script to only copy the file if it doesn't already exist.

r? `@m-ou-se`
cc `@Mark-Simulacrum`
    @bors @ehuss
    bors authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    f86b143 View commit details
    Browse the repository at this point in the history

  2. Auto merge of rust-lang#81055 - matthewjasper:non-fatal-overflow, r=n… 

    …ikomatsakis

Make hitting the recursion limit in projection non-fatal

This change was originally made in rust-lang#80246 to avoid future (effectively) infinite loop bugs in projections,
but wundergraph relies on rustc recovering here.

cc rust-lang#80953

r? `@nikomatsakis`
    @bors @ehuss
    bors authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    567eb04 View commit details
    Browse the repository at this point in the history

  3. Rollup merge of rust-lang#81532 - estebank:ice-ice-baby, r=pnkfelix 

    Remove incorrect `delay_span_bug`

The following code is supposed to compile

```rust
use std::ops::BitOr;

pub trait IntWrapper {
    type InternalStorage;
}

impl<T> BitOr for dyn IntWrapper<InternalStorage = T>
where
    Self: Sized,
    T: BitOr + BitOr<Output = T>,
{
    type Output = Self;
    fn bitor(self, _other: Self) -> Self {
        todo!()
    }
}
```

Before this change it would ICE. In rust-lang#70998 the removed logic was added
to provide better suggestions, and the `delay_span_bug` guard was added
to  protect against a potential logic error when returning traits. As it
happens, there are cases, like the one above, where traits can indeed be
returned, so valid code was being rejected.

Fix (but not close) rust-lang#80207.
    @m-ou-se @ehuss
    m-ou-se authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    f6b8e2b View commit details
    Browse the repository at this point in the history

  4. Rollup merge of rust-lang#81556 - nikomatsakis:forbidden-lint-groups-… 

    …lint, r=pnkfelix

introduce future-compatibility warning for forbidden lint groups

We used to ignore `forbid(group)` scenarios completely. This changed in rust-lang#78864, but that led to a number of regressions (rust-lang#80988, rust-lang#81218).

This PR introduces a future compatibility warning for the case where a group is forbidden but then an individual lint within that group is allowed. We now issue a FCW when we see the "allow", but permit it to take effect.

r? ``@Mark-Simulacrum``
    @m-ou-se @ehuss
    m-ou-se authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    3b03446 View commit details
    Browse the repository at this point in the history

  5. [beta] Update cargo

    @ehuss
    ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    d1eff4c View commit details
    Browse the repository at this point in the history

  6. Rollup merge of rust-lang#81288 - camelid:fix-trait-item-vis, r=jyn514 

    rustdoc: Fix visibility of trait and impl items

Fixes rust-lang#81274.

r? `@jyn514`
    @jonas-schievink @ehuss
    jonas-schievink authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    7906dc0 View commit details
    Browse the repository at this point in the history

  7. Auto merge of rust-lang#81229 - m-ou-se:solaris-workaround, r=pietroa… 

    …lbini

Work around missing -dev packages in solaris docker image.

This should hopefully make the `dist-various-2` docker build work again on CI, which is now blocking everything from getting merged.

r? `@pietroalbini`
    @bors @ehuss
    bors authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    e364d4a View commit details
    Browse the repository at this point in the history

  8. Rollup merge of rust-lang#81767 - exrook:layout-error-stability, r=Ma… 

    …rk-Simulacrum

Update LayoutError/LayoutErr stability attributes

`LayoutError` ended up not making it into 1.49.0, updating the stability attributes to reflect that.

I also pushed `LayoutErr` deprecation back a release to allow 2 releases before the deprecation comes into effect.

This change should be backported to beta.
    @m-ou-se @ehuss
    m-ou-se authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    78e57dc View commit details
    Browse the repository at this point in the history

  9. Auto merge of rust-lang#81257 - pnkfelix:issue-80949-short-term-resol… 

    …ution-via-revert-of-pr-78373, r=matthewjasper

Revert 78373 ("dont leak return value after panic in drop")

Short term resolution for issue rust-lang#80949.

Reopen rust-lang#47949 after this lands.

(We plan to fine-tune PR rust-lang#78373 to not run into this problem.)
    @bors @ehuss
    bors authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    eba5432 View commit details
    Browse the repository at this point in the history

  10. Rename panic_fmt lint to non_fmt_panic.

    @m-ou-se @ehuss
    m-ou-se authored and ehuss committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    fc81b7c View commit details
    Browse the repository at this point in the history