Rollup of 9 pull requests #60537
Merged
Rollup of 9 pull requests #60537
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds an rustfmt.toml for using for **new** code. Old code should continut to use old style, until we put automated style checks in place. See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81 for the reason why we deviate from the default formatting. The TL;DR is that currently compiler uses a pretty condensed style of code, and default settings both create a huge diff and inflate the number of lines. use_small_heuristics=Max fixes that. version=Two is required for bug-fixes, which technically can't be made to the stable first version
This commit fixes an ICE where simple bindings (which aren't replaced with replacement arguments during async fn lowering) were not being visited in the def collector and thus caused an ICE during HIR lowering for types that use their `DefId` at that point - such as `impl Trait`.
Account for paths in incorrect pub qualifier help Handle case where incorrect pub qualifier with a mod path is used and provide the same help given for all other incorrect qualifiers by making the `pub(crate)` parse check more specific.
…r=pnkfelix Constrain all regions in the concrete type for an opaque type `push_outlives_components` skips some regions in a type, notably the signature of a closure is ignored. Most of the time this is OK, but for opaque types the concrete type is used when checking auto-trait bounds in other functions. cc @nikomatsakis @pnkfelix Closes rust-lang#57464 Closes rust-lang#60127
… r=oli-obk Place related refactors Meanwhile I was working on Place 2 I'm finding some little things that I had on my branch but preferred to land a separate PR for things that are simpler to merge. r? @oli-obk
…, r=matthewjasper Remove -Z borrowck=compare flag This is the start of the work that needs to be done on rust-lang#59193. It just removes the flag and updates the tests. r? @matthewjasper
…asper Remove TypeckMir Fixes rust-lang#60422 r? @matthewjasper
Reword casting message r? @davidtwco
… r=Centril Add rustfmt toml This commit adds an rustfmt.toml for using for **new** code. Old code should continut to use old style, until we put automated style checks in place. See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81 for the reason why we deviate from the default formatting. The TL;DR is that currently compiler uses a pretty condensed style of code, and default settings both create a huge diff and inflate the number of lines. use_small_heuristics=Max fixes that. version=Two is required for bug-fixes, which technically can't be made to the stable first version cc @Centril: I guess adding config file with agreed-upon formatting doesn't hurt :-) EDIT: Zullip discussion: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/x.2Epy.20fmt
Migrate tidy to rust 2018 edition cc @Centril
Fix async fn lowering ICE with APIT. Fixes rust-lang#60518. This PR fixes an ICE where simple bindings (which aren't replaced with replacement arguments during async fn lowering) were not being visited in the def collector and thus caused an ICE during HIR lowering for types that use their `DefId` at that point - such as `impl Trait`. r? @cramertj
|
@bors r+ p=9 |
|
📌 Commit 1599877 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
May 4, 2019
Rollup of 9 pull requests Successful merges: - #60429 (Account for paths in incorrect pub qualifier help) - #60449 (Constrain all regions in the concrete type for an opaque type) - #60486 (Place related refactors) - #60513 (Remove -Z borrowck=compare flag) - #60516 (Remove TypeckMir) - #60517 (Reword casting message) - #60520 (Add rustfmt toml) - #60521 (Migrate tidy to rust 2018 edition) - #60527 (Fix async fn lowering ICE with APIT.) Failed merges: r? @ghost
|
☀️ Test successful - checks-travis, status-appveyor |
This was referenced May 4, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
Failed merges:
r? @ghost