Skip to content

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Jun 25, 2019

Based on #61779.

r? @gankro

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

Gankra commented Jun 25, 2019

I continue to be fine with the sharding implementation, but am not a rust-lang reviewer, and also don't know about the actual rustc code (seems largely mechanical?)

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 25, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned Gankra Jun 25, 2019
@bors
Copy link
Collaborator

bors commented Jun 30, 2019

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

@Zoxc Zoxc force-pushed the sharded-queries branch from c557857 to 190afcf Compare July 1, 2019 10:20
@Zoxc
Copy link
Contributor Author

Zoxc commented Jul 1, 2019

@bors try

@bors
Copy link
Collaborator

bors commented Jul 1, 2019

⌛ Trying commit 190afcf33d817f6733761ec0ca3d31830674a9f6 with merge 6396e7058917ab50a5a63b857866aef9499d7f4f...

@bors
Copy link
Collaborator

bors commented Jul 1, 2019

💥 Test timed out

@Zoxc
Copy link
Contributor Author

Zoxc commented Jul 1, 2019

@rust-timer build 6396e7058917ab50a5a63b857866aef9499d7f4f

@rust-timer
Copy link
Collaborator

Success: Queued 6396e7058917ab50a5a63b857866aef9499d7f4f with parent 765eebf, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 6396e7058917ab50a5a63b857866aef9499d7f4f, comparison URL.

@bors
Copy link
Collaborator

bors commented Jul 4, 2019

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

@Zoxc Zoxc changed the title [WIP] Use sharded maps for queries Use sharded maps for queries Jul 5, 2019
@Zoxc Zoxc force-pushed the sharded-queries branch from 190afcf to 1f58a1b Compare July 5, 2019 10:21
@edmilsonefs
Copy link

Hey! This is a ping from triage, we would like to know if you @oli-obk or @Zoxc could give us a few more minutes to update here so we can move forward .

Thanks.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 23, 2019

It's waiting for #61779 to get merged first

@bors
Copy link
Collaborator

bors commented Jul 23, 2019

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

@Zoxc Zoxc force-pushed the sharded-queries branch from 1f58a1b to 00dcd33 Compare July 24, 2019 02:42
@Zoxc
Copy link
Contributor Author

Zoxc commented Jul 24, 2019

Rebased out #61779.

@bors
Copy link
Collaborator

bors commented Jul 26, 2019

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

@Zoxc Zoxc force-pushed the sharded-queries branch from 00dcd33 to f84967f Compare July 26, 2019 03:46
@wirelessringo
Copy link

Ping from triage. @oli-obk any updates on this? Thank you.

@JohnTitor
Copy link
Member

Ping from triage: @oli-obk do you have time to review this?

@oli-obk
Copy link
Contributor

oli-obk commented Aug 11, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 11, 2019

📌 Commit f84967f has been approved by oli-obk

@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 Aug 11, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 11, 2019
bors added a commit that referenced this pull request Aug 11, 2019
Rollup of 8 pull requests

Successful merges:

 - #61969 (Add #[repr(transparent)] for several types)
 - #62108 (Use sharded maps for queries)
 - #63149 (resolve: Populate external modules in more automatic and lazy way)
 - #63346 (Lint on some incorrect uses of mem::zeroed / mem::uninitialized)
 - #63433 (Miri shouldn't look at types)
 - #63440 (rename RUST_CTFE_BACKTRACE to RUSTC_CTFE_BACKTRACE)
 - #63442 (Add an example to show how to insert item to a sorted vec)
 - #63459 (syntax: account for CVarArgs being in the argument list.)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Aug 12, 2019

⌛ Testing commit f84967f with merge 89fdc8d69e670a619552e804b1d8fa939e67497a...

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
@Centril
Copy link
Contributor

Centril commented Aug 12, 2019

@bors retry rolled up.

bors added a commit that referenced this pull request Aug 12, 2019
Rollup of 10 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Aug 12, 2019

⌛ Testing commit f84967f with merge 57aa2117c37824d1af595c36f7d178e65cb81219...

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
@Centril
Copy link
Contributor

Centril commented Aug 12, 2019

@bors retry rolled up.

bors added a commit that referenced this pull request Aug 12, 2019
Rollup of 9 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost
@bors bors merged commit f84967f into rust-lang:master Aug 12, 2019
@Zoxc Zoxc deleted the sharded-queries branch August 20, 2019 18:11
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.

10 participants