Skip to content

Stabilize attributes on generic parameters - #48851

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:genparattr
Apr 5, 2018
Merged

Stabilize attributes on generic parameters#48851
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:genparattr

Conversation

@petrochenkov

Copy link
Copy Markdown
Contributor

Closes#48848

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

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

Copy link
Copy Markdown
ContributorAuthor

r? @nikomatsakis

@kennytmkennytm added the T-lang Relevant to the language team label Mar 8, 2018
@CentrilCentril added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 8, 2018
@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

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

@nikomatsakisnikomatsakis 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
Copy Markdown
Contributor

Blocked on FCP in #48848

@emilyalbiniemilyalbini 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
@emilyalbini

Copy link
Copy Markdown
Member

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

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

r=me post rebase

@petrochenkov

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Apr 4, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1a2a234 has been approved by nikomatsakis

@borsbors 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
@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Collaborator

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

bors added a commit that referenced this pull request Apr 5, 2018
Stabilize attributes on generic parameters
Closes#48848
// 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
Copy Markdown
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

bors commented Apr 5, 2018

Copy link
Copy Markdown
Collaborator

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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotesMarks issues that should be documented in the release notes of the next release.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-langRelevant to the language team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@petrochenkov@rust-highfive@bors@nikomatsakis@emilyalbini@kennytm@pnkfelix@Centril