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 attributes on generic parameters #48851

Merged
merged 1 commit into from
Apr 5, 2018
Merged

Stabilize attributes on generic parameters #48851

merged 1 commit into from
Apr 5, 2018

Conversation

petrochenkov
Copy link
Contributor

Closes #48848

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

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

r? @nikomatsakis

@petrochenkov petrochenkov mentioned this pull request Mar 8, 2018
Closed
@kennytm kennytm added the T-lang Relevant to the language team, which will review and decide on the PR/issue. label Mar 8, 2018
@Centril Centril added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 8, 2018
@bors
Copy link
Contributor

bors commented Mar 9, 2018

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

@nikomatsakis nikomatsakis added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2018
@nikomatsakis
Copy link
Contributor

Blocked on FCP in #48848

@pietroalbini pietroalbini added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 26, 2018
@pietroalbini
Copy link
Member

The FCP in #48848 ended. Can you review this @nikomatsakis?

Also @petrochenkov, there are some merge conflicts you should fix.

@nikomatsakis
Copy link
Contributor

r=me post rebase

@petrochenkov
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Apr 4, 2018

📌 Commit 1a2a234 has been approved by nikomatsakis

@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 Apr 4, 2018
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Apr 5, 2018
@alexcrichton
Rollup merge of rust-lang#48851 - petrochenkov:genparattr, r=nikomats…
c887c22 
…akis

Stabilize attributes on generic parameters

Closes rust-lang#48848
@alexcrichton alexcrichton mentioned this pull request Apr 5, 2018
Closed
@bors
Copy link
Contributor

bors commented Apr 5, 2018

⌛ Testing commit 1a2a234 with merge 01d0be9...

bors added a commit that referenced this pull request Apr 5, 2018
@bors
Auto merge of #48851 - petrochenkov:genparattr, r=nikomatsakis
01d0be9 
Stabilize attributes on generic parameters

Closes #48848
@bors bors mentioned this pull request Apr 5, 2018
Merged
kennytm
kennytm reviewed Apr 5, 2018
View reviewed changes
src/libsyntax/feature_gate.rs
@@ -566,6 +563,8 @@ declare_features! (
(accepted, match_default_bindings, "1.26.0", Some(42640), None),
// allow `'_` placeholder lifetimes
(accepted, underscore_lifetimes, "1.26.0", Some(44524), None),
// Allows attributes on lifetime/type formal parameters in generics (RFC 1327)
(accepted, generic_param_attrs, "1.26.0", Some(48848), None),
Copy link
Member

Choose a reason for hiding this comment

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

Oops. This should be 1.27 now.

@bors
Copy link
Contributor

bors commented Apr 5, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 01d0be9 to master...

@bors bors merged commit 1a2a234 into rust-lang:master Apr 5, 2018
This was referenced Apr 5, 2018
Merged
Merged
@kennytm kennytm mentioned this pull request Apr 8, 2018
Closed
@upsuper upsuper mentioned this pull request Apr 27, 2018
Closed
@Havvy Havvy mentioned this pull request Jun 1, 2018
Merged
@petrochenkov petrochenkov deleted the genparattr branch June 5, 2019 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

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
No milestone
Development

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