Skip to content

Update itertools to 0.7.0 and log to 0.4 - #1605

Merged
bors merged 2 commits into
rust-lang:masterfrom
joshleeb:update-itertools-log
Feb 4, 2019
Merged

bors merged 2 commits into
rust-lang:masterfrom
joshleeb:update-itertools-log

Conversation

@joshleeb

@joshleeb joshleeb commented Jan 24, 2019 •

Copy link
Copy Markdown

This PR updates dependency crates itertools to 0.7.0 and log to 0.4.

Ref. #1265

@joshleeb joshleeb changed the title Update itertools to 0.7.0 and log to 0.4.0 Update itertools to 0.7.0 and log to 0.4 Jan 24, 2019
@sgrif

sgrif commented Jan 24, 2019

Copy link
Copy Markdown
Contributor

It looks like you accidentally updated a lot more than just those two dependencies, which has caused test failures. Did you maybe run cargo update on accident?

@joshleeb

Copy link
Copy Markdown
Author

Did you maybe run cargo update on accident?

@sgrif I didn't run cargo update. My method was to update the itertools entry in Cargo.toml directly and then run cargo build.

I suspect it is during the build the other versions in the lock file are being updated?

@sgrif

sgrif commented Jan 26, 2019

Copy link
Copy Markdown
Contributor

You might just want to make sure you've rebased on the latest master, then.

@sgrif

sgrif commented Jan 26, 2019

Copy link
Copy Markdown
Contributor

Scratch that, this isn't your fault. The author of ring has yanked all versions of their crate including the one that we depend on. Any attempts to change Cargo.toml in any way will now break our build. I'm looking into this now.

@sgrif

sgrif commented Jan 26, 2019

Copy link
Copy Markdown
Contributor

Update: Any changes to Cargo.toml will need to update Cargo.lock by hand unless the version of ring we depend on is unyanked (opened briansmith/ring#774 to try and get clarification) or we go through and update all of our transitive dependencies that use ring to 0.14. This involves a lot of crates that aren't actively maintained so that would be a major undertaking

@sgrif

sgrif commented Jan 26, 2019

Copy link
Copy Markdown
Contributor

This is blocked on #1607

@sgrif sgrif added the blocked label Jan 26, 2019
@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Contributor

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

@carols10cents

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Feb 4, 2019

Copy link
Copy Markdown
Contributor

📌 Commit a7cbb3d has been approved by carols10cents

@bors

bors commented Feb 4, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit a7cbb3d with merge e418a15...

bors added a commit that referenced this pull request Feb 4, 2019
Update itertools to 0.7.0 and log to 0.4

This PR updates dependency crates `itertools` to 0.7.0 and `log` to 0.4.

Ref. #1265
@bors

bors commented Feb 4, 2019

Copy link
Copy Markdown
Contributor

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

@bors
bors merged commit a7cbb3d into rust-lang:master Feb 4, 2019
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.

4 participants