Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos-mirror/rust
base: 9af4bdeab0d971d61ea59a02923944fc80daafcc
Choose a base ref
...
head repository: sailfishos-mirror/rust
compare: 7ede6e2a2359c1bb9032baffa4fdafe5633749e3
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Jun 28, 2021

  1. Only include lint in future_incompatible lint group if not an edition… 

    … lint
    @rylev
    rylev committed Jun 28, 2021
    Copy the full SHA
    0e28575 View commit details
    Browse the repository at this point in the history

  2. Add comment for future_incompatible lint group

    @rylev
    rylev committed Jun 28, 2021
    Copy the full SHA
    f0d7280 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Auto merge of #86689 - rylev:future-compat-lint-group, r=nikomatsakis 

    Only include lint in future_incompatible lint group if not an edition lint

A follow up to #86330 - this only includes lints annotated with `FutureIncompatibleInfo` in the `future_incompatibile` lint group if the future compatibility is not tied to an edition.

We probably want to rename `FutureIncompatibleInfo` to something else since this type is now used to indicate future breakages of all kinds (even those that happen in editions). I'd prefer to do that in a separate PR though.

r? `@nikomatsakis`
    @bors
    bors committed Jun 30, 2021
    Copy the full SHA
    51fd129 View commit details
    Browse the repository at this point in the history

  2. update Miri

    @RalfJung
    RalfJung committed Jun 30, 2021
    Copy the full SHA
    80fa596 View commit details
    Browse the repository at this point in the history

  3. Auto merge of #86739 - RalfJung:miri, r=RalfJung 

    update Miri

Fixes rust-lang/rust#86723
Cc `@rust-lang/miri` r? `@ghost`
    @bors
    bors committed Jun 30, 2021
    Copy the full SHA
    7ede6e2 View commit details
    Browse the repository at this point in the history