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

Refactor generic parameter encoder functions #58581

Merged
merged 3 commits into from
Mar 28, 2019

Conversation

varkor
Copy link
Member

@varkor varkor commented Feb 19, 2019

Addresses #58503 (comment).

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 19, 2019
@bors
Copy link
Contributor

bors commented Feb 26, 2019

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

@varkor varkor force-pushed the const-generics-encoder-refactor branch from ed15945 to 2423219 Compare February 26, 2019 21:16
@rust-highfive

This comment has been minimized.

@varkor varkor force-pushed the const-generics-encoder-refactor branch from 2423219 to 6217ee1 Compare March 14, 2019 00:14
@varkor
Copy link
Member Author

varkor commented Mar 18, 2019

I've updated to take account of the different kinds.

@eddyb
Copy link
Member

eddyb commented Mar 26, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Mar 26, 2019

📌 Commit 6217ee1 has been approved by eddyb

@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 Mar 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019
…tor, r=eddyb

Refactor generic parameter encoder functions

Addresses rust-lang#58503 (comment).

r? @eddyb
@Centril
Copy link
Contributor

Centril commented Mar 27, 2019

Speculatively assigning blame of failure in #59457 (comment). @bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 27, 2019
@varkor
Copy link
Member Author

varkor commented Mar 27, 2019

I'll rebase on top of #59466 and we'll see.

@cuviper
Copy link
Member

cuviper commented Mar 27, 2019

You may be vindicated -- #59466 (comment) failed the same way.

@varkor
Copy link
Member Author

varkor commented Mar 27, 2019

@bors r=eddyb rollup

@bors
Copy link
Contributor

bors commented Mar 27, 2019

📌 Commit 6217ee1 has been approved by eddyb

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 28, 2019
…tor, r=eddyb

Refactor generic parameter encoder functions

Addresses rust-lang#58503 (comment).

r? @eddyb
bors added a commit that referenced this pull request Mar 28, 2019
Rollup of 12 pull requests

Successful merges:

 - #57987 (Fix some AArch64 typos)
 - #58581 (Refactor generic parameter encoder functions)
 - #58803 (fs::copy() unix: set file mode early)
 - #58848 (Prevent cache issues on version updates)
 - #59198 (Do not complain about unmentioned fields in recovered patterns)
 - #59351 (Include llvm-ar with llvm-tools component)
 - #59413 (HirIdify hir::ItemId)
 - #59441 (Remove the block on natvis for lld-link.)
 - #59448 (Use consistent phrasing for all macro summaries)
 - #59456 (Add documentation about `for` used as higher ranked trait bounds)
 - #59472 (Document that `std::io::BufReader` discards contents on drop)
 - #59474 (Fix link capitalization in documentation of std::io::BufWriter.)

Failed merges:

r? @ghost
@bors bors merged commit 6217ee1 into rust-lang:master Mar 28, 2019
@varkor varkor deleted the const-generics-encoder-refactor branch March 28, 2019 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants