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

internal: move to Arc::from_iter #15986

Merged
merged 1 commit into from
Dec 6, 2023

Conversation

davidbarsky
Copy link
Contributor

Builds atop of #15985, will rebase.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 28, 2023
@davidbarsky davidbarsky force-pushed the david/move-to-arc-iter branch from 6217d89 to 48d8393 Compare November 28, 2023 16:13
@davidbarsky
Copy link
Contributor Author

...and rebased!

@lnicola
Copy link
Member

lnicola commented Nov 28, 2023

@Veykril want to postpone this until after #15959?

@Veykril
Copy link
Member

Veykril commented Nov 28, 2023

Would be nice if I didn't have to rebase over this

@lnicola
Copy link
Member

lnicola commented Nov 28, 2023

It's not as bad as it looks though, mainly Arc::from(x.collect::<Vec<_>>()) to Arc::from_iter(x). But this isn't urgent at all, so we can wait.

@davidbarsky
Copy link
Contributor Author

Yeah, the change looks substantially noisier than it actually is, but there's no rush on landing this.

@Veykril
Copy link
Member

Veykril commented Nov 29, 2023

its more it will conflict with my stuff and it touches things that I think i touched over multiple commits. Rebasing isnt really gonna be difficult but I'd also rather not have to rebase my stuff over this if I can avoid it

@davidbarsky
Copy link
Contributor Author

its more it will conflict with my stuff and it touches things that I think i touched over multiple commits. Rebasing isnt really gonna be difficult but I'd also rather not have to rebase my stuff over this if I can avoid it

yeah, fair. i'll wait to land this until your tokenmap work landed.

@Veykril Veykril added S-blocked Status: marked as 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 Nov 30, 2023
@bors
Copy link
Contributor

bors commented Dec 4, 2023

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

@davidbarsky davidbarsky force-pushed the david/move-to-arc-iter branch from 48d8393 to c17dcc8 Compare December 6, 2023 18:08
@davidbarsky
Copy link
Contributor Author

alright, this PR is no longer blocked.

@lnicola
Copy link
Member

lnicola commented Dec 6, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Dec 6, 2023

📌 Commit c17dcc8 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 6, 2023

⌛ Testing commit c17dcc8 with merge 311a5e9...

@bors
Copy link
Contributor

bors commented Dec 6, 2023

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 311a5e9 to master...

@bors bors merged commit 311a5e9 into rust-lang:master Dec 6, 2023
@davidbarsky davidbarsky deleted the david/move-to-arc-iter branch December 6, 2023 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants