Skip to content

Refactor generic parameter encoder functions - #58581

Merged
bors merged 3 commits into
rust-lang:masterfrom
varkor:const-generics-encoder-refactor
Mar 28, 2019
Merged

Refactor generic parameter encoder functions#58581
bors merged 3 commits into
rust-lang:masterfrom
varkor:const-generics-encoder-refactor

Conversation

@varkor

Copy link
Copy Markdown
Contributor

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

bors commented Feb 26, 2019

Copy link
Copy Markdown
Collaborator

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

Comment threadsrc/librustc_metadata/encoder.rs Outdated
Comment threadsrc/librustc_metadata/encoder.rs Outdated
@varkor
varkorforce-pushed the const-generics-encoder-refactor branch from ed15945 to 2423219CompareFebruary 26, 2019 21:16
@rust-highfive

This comment has been minimized.

@varkor
varkorforce-pushed the const-generics-encoder-refactor branch from 7dc5060 to 2423219CompareFebruary 26, 2019 22:49
@varkor
varkorforce-pushed the const-generics-encoder-refactor branch from 2423219 to 6217ee1CompareMarch 14, 2019 00:14
@varkor

Copy link
Copy Markdown
ContributorAuthor

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

@eddyb

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 6217ee1 has been approved by eddyb

@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 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
@CentrilCentril mentioned this pull request Mar 27, 2019
@Centril

Copy link
Copy Markdown
Contributor

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

@borsbors 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
Copy Markdown
ContributorAuthor

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

@cuviper

Copy link
Copy Markdown
Member

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

@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors r=eddyb rollup

@bors

bors commented Mar 27, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 6217ee1 has been approved by eddyb

@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-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
@CentrilCentril mentioned this pull request Mar 28, 2019
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:masterMar 28, 2019
@varkor
varkor deleted the const-generics-encoder-refactor branch March 28, 2019 12:27
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@varkor@bors@rust-highfive@eddyb@Centril@cuviper