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

[beta] Rollup backports #57516

Merged
merged 16 commits into from Jan 11, 2019

Conversation

Projects
None yet
5 participants
@pietroalbini
Copy link
Member

pietroalbini commented Jan 11, 2019

Cherry-picked:

  • #57355: use the correct supertrait substitution in object_ty_for_trait
  • #57471: Updated RELEASES.md for 1.32.0

Rolled up:

  • #57483: [beta] Uniform path backports
    • c658d73: resolve: Avoid "self-confirming" resolutions in import validation
    • #57160: resolve: Fix an ICE in import validation
    • #56759: Stabilize uniform_paths

r? @ghost

petrochenkov and others added some commits Nov 30, 2018

resolve: Prohibit use of uniform paths in macros originating from 201…
…5 edition

...while still keeping ambiguity errors future-proofing for uniform paths.
This corner case is not going to be stabilized for 1.32 and needs some more general experiments about retrofitting 2018 import rules to 2015 edition
Fix a hole in generic parameter import future-proofing
Add some tests for buggy derive helpers
Apply suggestions from code review
Co-Authored-By: Aaronepower <Aaronepower@users.noreply.github.com>
@pietroalbini

This comment has been minimized.

Copy link
Member

pietroalbini commented Jan 11, 2019

@bors r+ p=100

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 11, 2019

📌 Commit 907d94c has been approved by pietroalbini

@pietroalbini

This comment has been minimized.

Copy link
Member

pietroalbini commented Jan 11, 2019

@bors r-

@pietroalbini pietroalbini force-pushed the pietroalbini:beta-rollup branch from 907d94c to 17f510b Jan 11, 2019

@pietroalbini

This comment has been minimized.

Copy link
Member

pietroalbini commented Jan 11, 2019

Also rolled up #56759.

@bors r+ p=100

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 11, 2019

📌 Commit 17f510b has been approved by pietroalbini

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 11, 2019

⌛️ Testing commit 17f510b with merge 31d631f...

bors added a commit that referenced this pull request Jan 11, 2019

Auto merge of #57516 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #57355: use the correct supertrait substitution in `object_ty_for_trait`
* #57471: Updated RELEASES.md for 1.32.0

Rolled up:

* #57483: [beta] Uniform path backports
  * c658d73: resolve: Avoid "self-confirming" resolutions in import validation
  * #57160: resolve: Fix an ICE in import validation
  * #56759: Stabilize `uniform_paths`

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 11, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pietroalbini
Pushing 31d631f to beta...

@bors bors merged commit 17f510b into rust-lang:beta Jan 11, 2019

1 check passed

homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment