Skip to content

Bump r2d2 #1899

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

Merged
merged 1 commit into from
Nov 22, 2019
Merged

Bump r2d2 #1899

merged 1 commit into from
Nov 22, 2019

Conversation

jtgeibel
Copy link
Member

cargo update -p r2d2

Refs: #1805

@rust-highfive
Copy link

r? @smarnach

(rust_highfive has picked a reviewer for you, use r? to override)

@jtgeibel
Copy link
Member Author

We should do the deploy, merge, deploy dance on this one, just to be safe.

@smarnach
Copy link
Contributor

This pulls in two new versions of parking_lot (in addition to the two versions we've already been using), so there is definitely some potential for things going wrong there.

I can't deploy, so I'm randomly selecting
r? @carols10cents
as new assignee.

@jtgeibel
Copy link
Member Author

This pulls in two new versions of parking_lot (in addition to the two versions we've already been using)

Yeah, this is unfortunate. (Although the duplication isn't quite that bad, as one pair is parking_lot and the other parking_lot_core.) Long term, I'm hoping to get this under control, but its difficult because we effectively can't run cargo update at this time.

In terms of build time, it especially bad that we pull in 3 or 4 versions of syn and quote. Fortunately, these are both 1.0 now so as we update other things those should consolidate.

@carols10cents
Copy link
Member

I'm good with this, but I don't want to do this at the same time that we're switching to cloudfront, so I'll do the deploy-merge-deploy dance on Wednesday.

@carols10cents
Copy link
Member

Dance time!!!

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2019

📌 Commit 4876857 has been approved by carols10cents

@bors
Copy link
Contributor

bors commented Nov 22, 2019

⌛ Testing commit 4876857 with merge ae7834e...

bors added a commit that referenced this pull request Nov 22, 2019
Bump r2d2

`cargo update -p r2d2`

Refs: #1805
@bors
Copy link
Contributor

bors commented Nov 22, 2019

☀️ Test successful - checks-travis
Approved by: carols10cents
Pushing ae7834e to master...

@bors bors merged commit 4876857 into rust-lang:master Nov 22, 2019
@jtgeibel jtgeibel deleted the upgrade/r2d2 branch November 23, 2019 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants