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.

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

expect fn after const unsafe / const extern #68073

Merged
merged 1 commit into from
Jan 10, 2020
Merged

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jan 9, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 9, 2020
@Centril Centril added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 9, 2020
@estebank
Copy link
Contributor

estebank commented Jan 9, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 9, 2020

📌 Commit 915db7a has been approved by estebank

@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 9, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 10, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 10, 2020
bors added a commit that referenced this pull request Jan 10, 2020
Rollup of 6 pull requests

Successful merges:

 - #66463 (Point at opaque and closure type definitions in type errors)
 - #67501 (Reduce special treatment for zsts)
 - #67820 (Parse the syntax described in RFC 2632)
 - #67922 (rustc_ast_lowering: misc cleanup & rustc dep reductions)
 - #68071 (Extend support of `_` in type parameters)
 - #68073 (expect `fn` after `const unsafe` / `const extern`)

Failed merges:

r? @ghost
@bors bors merged commit 915db7a into rust-lang:master Jan 10, 2020
@Centril Centril deleted the fix-68062 branch January 10, 2020 05:56
@pnkfelix
Copy link
Member

discussed at T-compiler meeting. beta-accepted.

@Centril Centril added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 16, 2020
@pnkfelix
Copy link
Member

discussed at T-compiler meeting. stable-accepted.

@pnkfelix pnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Jan 16, 2020
@cuviper cuviper mentioned this pull request Jan 17, 2020
bors added a commit that referenced this pull request Jan 19, 2020
Beta backports

- expect `fn` after `const unsafe` / `const extern` #68073
- Do not ICE on unicode next point #68084
- rustdoc: Don't allow `#![feature(...)]` on stable or beta #67989

r? @Mark-Simulacrum
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 23, 2020
@Mark-Simulacrum Mark-Simulacrum removed stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

const extern fn's dont need fn specifier
6 participants