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

Stabilize rfc 1506 - Clarified ADT Kinds #41145

Merged
merged 4 commits into from
May 25, 2017
Merged

Stabilize rfc 1506 - Clarified ADT Kinds #41145

merged 4 commits into from
May 25, 2017

Conversation

matthewjasper
Copy link
Contributor

@matthewjasper matthewjasper commented Apr 7, 2017 •
edited
Loading

Closes #35626

Documentation:

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@matthewjasper matthewjasper mentioned this pull request Apr 7, 2017
Merged
@Mark-Simulacrum
Copy link
Member

Thanks! We'll try to get someone to review your PR soon! r? @pnkfelix

@pnkfelix
Copy link
Member

Wait, can I merge this before the docs land?

@pnkfelix
Copy link
Member

(It certainly looks fine; this is more a process issue.)

@matthewjasper
Copy link
Contributor Author

matthewjasper commented Apr 14, 2017 •
edited
Loading

/cc @steveklabnik ?

@arielb1 arielb1 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-lang Relevant to the language team, which will review and decide on the PR/issue. labels Apr 15, 2017
@arielb1
Copy link
Contributor

arielb1 commented Apr 18, 2017 •
edited
Loading

r? @arielb1. I'll be looking at this shortly.

@arielb1
Copy link
Contributor

arielb1 commented Apr 18, 2017 •
edited
Loading

I think we should be waiting for the docs to land to avoid this being split across 1.17/1.18. but r=me after that.

@bors
Copy link
Contributor

bors commented Apr 20, 2017

☔ The latest upstream changes (presumably #41411) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Apr 22, 2017

☔ The latest upstream changes (presumably #39999) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Apr 22, 2017

☔ The latest upstream changes (presumably #41464) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Apr 23, 2017

☔ The latest upstream changes (presumably #41437) made this pull request unmergeable. Please resolve the merge conflicts.

@arielb1
Copy link
Contributor

arielb1 commented Apr 25, 2017

Still waiting for the docs to land on reference.

@arielb1 arielb1 added S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2017
@arielb1
Copy link
Contributor

arielb1 commented May 2, 2017

Still waiting for the docs to land on reference. But there's a light at the end of the tunnel:

Sorry about this! Still working out how to best do these kinds of things. I will get to it early next week; right now RustFest is going on.

@carols10cents
Copy link
Member

@arielb1 was that @steveklabnik you were quoting there? What's the current status of this?

@brson
Copy link
Contributor

brson commented May 22, 2017

This is a real easy feature to land for 1.19, just need to resolve this docs pr in the next two weeks.

@steveklabnik
Copy link
Member

steveklabnik commented May 22, 2017 •
edited
Loading

@brson I have wanted to get on it but haven't; IMHO, since we have the PR, this can land. Generally it's

  1. send in docs pr
  2. land the pr
  3. land the docs pr

so we don't churn feature flags in the docs.

given that this is the only thing blocking, we should land this, and I will make it a priority to get this reviewed. I didn't realize it was considered blocking here.

@bors
Copy link
Contributor

bors commented May 23, 2017

☔ The latest upstream changes (presumably #42165) made this pull request unmergeable. Please resolve the merge conflicts.

Gordon-F
Gordon-F reviewed May 23, 2017
View reviewed changes
src/libsyntax/feature_gate.rs Outdated
@@ -1291,6 +1287,11 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
ast::ExprKind::InPlace(..) => {
gate_feature_post!(&self, placement_in_syntax, e.span, EXPLAIN_PLACEMENT_IN);
}
<<<<<<< HEAD
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfinished conflict?

@matthewjasper matthewjasper force-pushed the stabilize-relaxed-adts branch 2 times, most recently from b8750cf to 1573142 Compare May 23, 2017 12:58
@petrochenkov
Copy link
Contributor

Given @steveklabnik's comment #41145 (comment)
@bors r+

@bors
Copy link
Contributor

bors commented May 25, 2017

📌 Commit 6627ef2 has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented May 25, 2017

⌛ Testing commit 6627ef2 with merge d0811c9...

bors added a commit that referenced this pull request May 25, 2017
@bors
Auto merge of #41145 - matthewjasper:stabilize-relaxed-adts, r=petroc…
d0811c9 
…henkov

Stabilize rfc 1506 - Clarified ADT Kinds

Closes #35626

Documentation:

- [ ] Reference rust-lang/reference#37
- [ ] Book?
- [ ] Rust by example?
@bors bors mentioned this pull request May 25, 2017
Merged
@bors
Copy link
Contributor

bors commented May 25, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing d0811c9 to master...

@bors bors merged commit 6627ef2 into rust-lang:master May 25, 2017
@bors bors mentioned this pull request May 25, 2017
Closed
@nikomatsakis nikomatsakis mentioned this pull request May 25, 2017
Closed
2 tasks
@petrochenkov petrochenkov mentioned this pull request Jun 7, 2017
Closed
@matthewjasper matthewjasper deleted the stabilize-relaxed-adts branch September 3, 2018 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gordon-F Gordon-F Gordon-F left review comments

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). T-lang Relevant to the language team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.