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] Uniform path backports #57483

Merged
merged 9 commits into from
Jan 11, 2019
Merged

[beta] Uniform path backports #57483

merged 9 commits into from
Jan 11, 2019

Conversation

petrochenkov
Copy link
Contributor

What's included:

r? @Mark-Simulacrum

@petrochenkov
resolve: Avoid "self-confirming" resolutions in import validation
063553f
@petrochenkov
resolve: Fix an ICE in import validation
98e435e
@petrochenkov
resolve: Assign pub and pub(crate) visibilities to macro_rules …
62956b5 
…items
@petrochenkov
resolve: Prohibit use of uniform paths in macros originating from 201…
98567b5 
…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
@petrochenkov
resolve: Prohibit use of imported non-macro attributes
bfb9b95
@petrochenkov
resolve: Prohibit use of imported tool modules
e412291
@petrochenkov
Stabilize uniform_paths
19836b2
@petrochenkov
Fix a hole in generic parameter import future-proofing
079f44f 
Add some tests for buggy derive helpers
@petrochenkov
Fix rebase
bc232d3
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2019
@petrochenkov
Copy link
Contributor Author

@bors try

@petrochenkov petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2019
@bors
Copy link
Contributor

bors commented Jan 10, 2019

⌛ Trying commit bc232d3 with merge 0d8b5d1...

bors added a commit that referenced this pull request Jan 10, 2019
@bors
Auto merge of #57483 - petrochenkov:beta, r=<try>
0d8b5d1 
[beta] Uniform path backports

What's included:
- c658d73 ("resolve: Avoid "self-confirming" resolutions in import validation", prerequisite for the following items)
- #57160 ("resolve: Fix an ICE in import validation")
- #56759 ("Stabilize `uniform_paths`")

r? @Mark-Simulacrum
@Mark-Simulacrum
Copy link
Member

cc @Aaronepower (for #57471) -- I think it's likely this will land and if necessary I can take on backing it out of stable last minute

This was referenced Jan 10, 2019
Merged
Merged
@petrochenkov
Copy link
Contributor Author

@ 💂‍♂️ craterbot run start=master#2bde39b8edce6463e1c37f8a8082a875e7b536b1 end=try#0d8b5d1f16bab9e975695518ff8705bdab9fe94c mode=check-only

@petrochenkov petrochenkov mentioned this pull request Jan 10, 2019
Merged
@bors
Copy link
Contributor

bors commented Jan 10, 2019

☀️ Test successful - checks-travis
State: approved= try=True

@Mark-Simulacrum
Copy link
Member

@craterbot run start=master#2bde39b8edce6463e1c37f8a8082a875e7b536b1 end=try#0d8b5d1f16bab9e975695518ff8705bdab9fe94c mode=check-only

@craterbot
Copy link
Collaborator

👌 Experiment pr-57483 created and queued.
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot
Copy link
Collaborator

🚧 Experiment pr-57483 is now running on agent aws-2.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@nikomatsakis
Copy link
Contributor

Discussed in the @rust-lang/compiler meeting. We decided we're definitely ok with backporting the first two PRs. As for the third PR, we don't typically backport stabilizations, but in this case this would help close a source of active problems around migration (see this list of related bugs). Therefore, 👍 to backport if the crater run results look good.

@Centril Centril added T-lang Relevant to the language team, which will review and decide on the PR/issue. relnotes Marks issues that should be documented in the release notes of the next release. labels Jan 11, 2019
@pietroalbini
Copy link
Member

I included c658d73 and #57160 in the rollup (#57516), so we'll only need to backport the stabilization if crater is ok.

@craterbot
Copy link
Collaborator

🎉 Experiment pr-57483 is completed!
📊 0 regressed and 1 fixed (50551 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Jan 11, 2019
@pietroalbini
Copy link
Member

Crater results looks good!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2019

📌 Commit bc232d3 has been approved by pietroalbini

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 11, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Jan 11, 2019
@pietroalbini
Rollup merge of rust-lang#57483 - petrochenkov:beta, r=pietroalbini
17f510b
@pietroalbini pietroalbini mentioned this pull request Jan 11, 2019
Merged
@pietroalbini
Copy link
Member

Rolled up inside #57516.

bors added a commit that referenced this pull request Jan 11, 2019
@bors
Auto merge of #57516 - pietroalbini:beta-rollup, r=pietroalbini
31d631f 
[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 bors merged commit bc232d3 into rust-lang:beta Jan 11, 2019
@Centril Centril added this to the 1.32 milestone Apr 27, 2019
@petrochenkov petrochenkov deleted the beta branch June 5, 2019 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-lang Relevant to the language team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.32
Development

Successfully merging this pull request may close these issues.
8 participants
@petrochenkov @rust-highfive @bors @Mark-Simulacrum @craterbot @nikomatsakis @pietroalbini @Centril