Skip to content

/rust

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

Stabilize rfc 1506 - Clarified ADT Kinds #41145

Merged
merged 4 commits into from May 25, 2017

Conversation

Reviewers

@Gordon-F Gordon-F

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-team T-lang
Projects
None yet
Milestone
No milestone
@matthewjasper
Copy link
Contributor

matthewjasper commented Apr 7, 2017 •
edited

Closes #35626

Documentation:

@rust-highfive rust-highfive assigned pnkfelix Apr 7, 2017

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Apr 7, 2017

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 referenced this pull request Apr 7, 2017

Merged

Document rfc 1506 - clarified adt kinds #37

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 15caa61 to f90ccd3 Apr 7, 2017

@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member

Mark-Simulacrum commented Apr 14, 2017

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

This comment has been minimized.

Sign in to view
Copy link
Member

pnkfelix commented Apr 14, 2017

Wait, can I merge this before the docs land?
@pnkfelix

This comment has been minimized.

Sign in to view
Copy link
Member

pnkfelix commented Apr 14, 2017

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

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

matthewjasper commented Apr 14, 2017 •
edited

/cc @steveklabnik ?

@arielb1 arielb1 added S-waiting-on-review T-lang labels Apr 15, 2017

@arielb1

This comment has been minimized.

Sign in to view
Copy link
Contributor

arielb1 commented Apr 18, 2017 •
edited

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

This comment has been minimized.

Sign in to view
Copy link
Contributor

arielb1 commented Apr 18, 2017 •
edited

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

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Apr 20, 2017

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

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 5217489 to 3e59b34 Apr 20, 2017

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 3e59b34 to 5fc2522 Apr 20, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Apr 22, 2017

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

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 5fc2522 to 8927212 Apr 22, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Apr 22, 2017

☔️ The latest upstream changes (presumably #41464) made this pull request unmergeable. Please resolve the merge conflicts.
@matthewjasper
Resolve merge conflict
Loading status checks…
8a3ea01

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 8927212 to 8a3ea01 Apr 22, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Apr 23, 2017

☔️ The latest upstream changes (presumably #41437) made this pull request unmergeable. Please resolve the merge conflicts.
@matthewjasper
Fix more merge conflicts
Loading status checks…
158b085
@arielb1

This comment has been minimized.

Sign in to view
Copy link
Contributor

arielb1 commented Apr 25, 2017

Still waiting for the docs to land on reference.

@arielb1 arielb1 added S-waiting-on-team and removed S-waiting-on-review labels Apr 25, 2017

@arielb1

This comment has been minimized.

Sign in to view
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

This comment has been minimized.

Sign in to view
Copy link
Member

carols10cents commented May 22, 2017

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

This comment has been minimized.

Sign in to view
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

This comment has been minimized.

Sign in to view
Copy link
Member

steveklabnik commented May 22, 2017 •
edited

@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

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented May 23, 2017

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

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 839d148 to 354ba2b May 23, 2017

@Gordon-F

Gordon-F reviewed May 23, 2017
View 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

This comment has been minimized.

Sign in to view
Copy link
@Gordon-F

Gordon-F May 23, 2017

Unfinished conflict?

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch 2 times, most recently from b8750cf to 1573142 May 23, 2017

@matthewjasper
Stabilize in 1.19
Loading status checks…
6627ef2

@matthewjasper matthewjasper force-pushed the matthewjasper:stabilize-relaxed-adts branch from 1573142 to 6627ef2 May 23, 2017

@petrochenkov

This comment has been minimized.

Sign in to view
Copy link
Contributor

petrochenkov commented May 25, 2017

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

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented May 25, 2017

📌 Commit 6627ef2 has been approved by petrochenkov
@bors

This comment has been minimized.

Sign in to view
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… 
…henkov

Stabilize rfc 1506 - Clarified ADT Kinds

Closes #35626

Documentation:

- [ ] Reference rust-lang-nursery/reference#37
- [ ] Book?
- [ ] Rust by example?
Loading status checks…
d0811c9

@bors bors referenced this pull request May 25, 2017

Merged

Make assignments to `Copy` union fields safe #42083

@bors

This comment has been minimized.

Sign in to view
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
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors bors referenced this pull request May 25, 2017

Closed

Stabilize non capturing closure to fn coercion #42162

@nikomatsakis nikomatsakis referenced this pull request May 25, 2017

Closed

Tracking issue for "clarified ADT kinds" (RFC 1506) #35626

2 of 2 tasks complete

@petrochenkov petrochenkov referenced this pull request Jun 7, 2017

Closed

Updated releases notes for 1.19 #42503

@matthewjasper matthewjasper deleted the matthewjasper:stabilize-relaxed-adts branch Sep 3, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.