Update some of Cargo's dependencies by alexcrichton · Pull Request #68012 · rust-lang/rust

alexcrichton · 2020-01-08T15:34:51Z

This is primarily updating the curl dependency, but also went ahead
and applied a few updates for other packages that Cargo depends on.

rust-highfive · 2020-01-08T15:35:04Z

r? @nikomatsakis

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

Mark-Simulacrum · 2020-01-08T15:38:13Z

Out of interest, how was this done? Just manually? I wasn't aware there was a way to update (recursively) dependencies of a "subproject" of a project.

@bors r+

bors · 2020-01-08T15:38:15Z

📌 Commit 8212bd2 has been approved by Mark-Simulacrum

alexcrichton · 2020-01-08T15:39:51Z

Technically it should be done via cargo update -p cargo --aggressive, but that fails because jobserver, a transitive dependency of cargo, can't be updated. Other than that it was just me manually typing cargo update commands yeah

mati865 · 2020-01-08T16:30:00Z

Other than that it was just me manually typing cargo update commands yeah

The best workaround I've found for #65014 is manually removing crates that you want update from Cargo.lock. Running ./x.py will readd their latest compatible version.

…rk-Simulacrum Update some of Cargo's dependencies This is primarily updating the `curl` dependency, but also went ahead and applied a few updates for other packages that Cargo depends on.

JohnTitor · 2020-01-13T18:34:25Z

Seems failed in #68134 (comment) and #68181 (comment)
@bors r-

alexcrichton · 2020-01-13T21:18:55Z

@bors: r=Mark-Simulacrum

bors · 2020-01-13T21:18:56Z

📌 Commit 2e052ee has been approved by Mark-Simulacrum

…rk-Simulacrum Update some of Cargo's dependencies This is primarily updating the `curl` dependency, but also went ahead and applied a few updates for other packages that Cargo depends on.

bors · 2020-01-15T13:10:47Z

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

bors · 2020-01-23T07:09:55Z

⌛ Testing commit 3a11a78c80718d107f211baea6d241196bed9dc6 with merge da5a4c9488c9469faad7854ed17026648e720cf4...

rust-highfive · 2020-01-23T07:26:38Z

The job x86_64-gnu-distcheck of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-01-23T07:24:51.3107848Z tidy check
2020-01-23T07:24:52.8693290Z * 589 error codes
2020-01-23T07:24:52.8694339Z * highest error code: E0746
2020-01-23T07:24:53.2909051Z * 278 features
2020-01-23T07:24:53.7116456Z invalid license MIT/Apache-2.0 AND BSD-2-Clause in /checkout/obj/build/tmp/distcheck/src/../vendor/crossbeam-channel/Cargo.toml
2020-01-23T07:24:53.7141370Z invalid license MIT/Apache-2.0 AND BSD-2-Clause in /checkout/obj/build/tmp/distcheck/src/../vendor/crossbeam-channel-0.3.9/Cargo.toml
2020-01-23T07:24:54.3522816Z some tidy checks failed
2020-01-23T07:24:54.3523022Z Found 487 error codes
2020-01-23T07:24:54.3523103Z Found 0 error codes with no tests
2020-01-23T07:24:54.3523236Z Done!
2020-01-23T07:24:54.3523236Z Done!
2020-01-23T07:24:54.3523279Z 
2020-01-23T07:24:54.3523321Z 
2020-01-23T07:24:54.3524666Z command did not execute successfully: "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/obj/build/tmp/distcheck/src" "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo"
2020-01-23T07:24:54.3524954Z 
2020-01-23T07:24:54.3525000Z 
2020-01-23T07:24:54.3548406Z failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
2020-01-23T07:24:54.3548574Z Build completed unsuccessfully in 0:03:18
---
2020-01-23T07:24:54.3691756Z   local time: Thu Jan 23 07:24:54 UTC 2020
2020-01-23T07:24:54.6337739Z   network time: Thu, 23 Jan 2020 07:24:54 GMT
2020-01-23T07:24:54.6337880Z == end clock drift check ==
2020-01-23T07:24:55.5826042Z 
2020-01-23T07:24:55.5934088Z ##[error]Bash exited with code '1'.
2020-01-23T07:24:55.5973738Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-01-23T07:24:55.5976020Z ==============================================================================
2020-01-23T07:24:55.5976112Z Task         : Get sources
2020-01-23T07:24:55.5976233Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2020-01-23T07:26:50Z

💔 Test failed - checks-azure

alexcrichton · 2020-01-23T15:12:50Z

@bors: r=Mark-Simulacrum

bors · 2020-01-23T15:12:52Z

📌 Commit de395f833273d23416454e32911209bd85487384 has been approved by Mark-Simulacrum

bors · 2020-01-23T18:13:00Z

⌛ Testing commit de395f833273d23416454e32911209bd85487384 with merge 0112e58d76add805924041dc687c16f92b4d2063...

rust-highfive · 2020-01-23T19:38:46Z

The job dist-i686-freebsd of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-01-23T19:37:42.0838241Z [RUSTC-TIMING] cargo_fmt test:false 11.442
2020-01-23T19:37:46.3395277Z [RUSTC-TIMING] git_rustfmt test:false 10.868
2020-01-23T19:37:50.4351936Z [RUSTC-TIMING] rustfmt test:false 8.345
2020-01-23T19:37:50.4396945Z     Finished release [optimized] target(s) in 10m 17s
2020-01-23T19:37:50.4612800Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2020-01-23T19:37:50.4613372Z the following dependencies are duplicated although they have the same features enabled:
2020-01-23T19:37:50.4613466Z the following dependencies have different features:
2020-01-23T19:37:50.4613466Z the following dependencies have different features:
2020-01-23T19:37:50.4614211Z   syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)
2020-01-23T19:37:50.4618864Z     `rustfmt` additionally enabled features {"extra-traits", "full"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libsyn-e75677640b251d40.rlib"
2020-01-23T19:37:50.4619969Z     `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libsyn-9b0170ecddca04f1.rlib"
2020-01-23T19:37:50.4620543Z   syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)
2020-01-23T19:37:50.4627100Z     `rustfmt` additionally enabled features {"visit"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libsyn-3067b0cebbe555ad.rlib"
2020-01-23T19:37:50.4627840Z     `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libsyn-6d60b93d1bf5d8a2.rlib"
2020-01-23T19:37:50.4628268Z 
2020-01-23T19:37:50.4629269Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
2020-01-23T19:37:50.4629918Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:195:13
2020-01-23T19:37:50.4682365Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host i686-unknown-freebsd --target i686-unknown-freebsd
2020-01-23T19:37:50.4682516Z Build completed unsuccessfully in 1:19:42
2020-01-23T19:37:50.4736411Z == clock drift check ==
2020-01-23T19:37:51.4522971Z   local time: Thu Jan 23 19:37:50 UTC 2020
2020-01-23T19:37:51.4522971Z   local time: Thu Jan 23 19:37:50 UTC 2020
2020-01-23T19:37:51.4532267Z   network time: Thu, 23 Jan 2020 19:37:50 GMT
2020-01-23T19:37:51.4532701Z == end clock drift check ==
2020-01-23T19:37:51.9857654Z 
2020-01-23T19:37:51.9938688Z ##[error]Bash exited with code '1'.
2020-01-23T19:37:51.9973488Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-01-23T19:37:51.9975447Z ==============================================================================
2020-01-23T19:37:51.9975549Z Task         : Get sources
2020-01-23T19:37:51.9975627Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2020-01-23T19:39:01Z

💔 Test failed - checks-azure

This is primarily updating the `curl` dependency, but also went ahead and applied a few updates for other packages that Cargo depends on.

alexcrichton · 2020-01-23T23:18:12Z

@bors: r=Mark-Simulacrum

bors · 2020-01-23T23:18:13Z

📌 Commit aabf4e9 has been approved by Mark-Simulacrum

bors · 2020-01-23T23:44:57Z

⌛ Testing commit aabf4e9 with merge 62f227b...

Update some of Cargo's dependencies This is primarily updating the `curl` dependency, but also went ahead and applied a few updates for other packages that Cargo depends on.

bors · 2020-01-24T03:06:16Z

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 62f227b to master...

rust-highfive assigned nikomatsakis Jan 8, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020

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 Jan 8, 2020

Centril mentioned this pull request Jan 11, 2020

Rollup of 5 pull requests #68134

Closed

Dylan-DPC-zz mentioned this pull request Jan 13, 2020

Rollup of 5 pull requests #68181

Closed

bors 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 Jan 13, 2020

alexcrichton force-pushed the update-some-deps branch from 8212bd2 to 2e052ee Compare January 13, 2020 21:18

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2020

Dylan-DPC-zz mentioned this pull request Jan 14, 2020

Rollup of 7 pull requests #68225

Closed

bors 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 Jan 15, 2020

alexcrichton force-pushed the update-some-deps branch from 2e052ee to a3d6225 Compare January 15, 2020 15:10

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 23, 2020

alexcrichton force-pushed the update-some-deps branch from 3a11a78 to de395f8 Compare January 23, 2020 15:12

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 Jan 23, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 23, 2020

Update some of Cargo's dependencies

aabf4e9

This is primarily updating the `curl` dependency, but also went ahead and applied a few updates for other packages that Cargo depends on.

alexcrichton force-pushed the update-some-deps branch from de395f8 to aabf4e9 Compare January 23, 2020 23:18

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 Jan 23, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 24, 2020

bors merged commit aabf4e9 into rust-lang:master Jan 24, 2020

alexcrichton deleted the update-some-deps branch July 23, 2020 21:21

ehuss mentioned this pull request Aug 30, 2023

cargo panics when stdin to it is closed rust-lang/cargo#6723

Closed

Uh oh!

Conversation

alexcrichton commented Jan 8, 2020

Uh oh!

rust-highfive commented Jan 8, 2020

Uh oh!

Mark-Simulacrum commented Jan 8, 2020

Uh oh!

bors commented Jan 8, 2020

Uh oh!

alexcrichton commented Jan 8, 2020

Uh oh!

mati865 commented Jan 8, 2020

Uh oh!

JohnTitor commented Jan 13, 2020

Uh oh!

alexcrichton commented Jan 13, 2020

Uh oh!

bors commented Jan 13, 2020

Uh oh!

bors commented Jan 15, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

rust-highfive commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

alexcrichton commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

rust-highfive commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

alexcrichton commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

bors commented Jan 23, 2020

Uh oh!

bors commented Jan 24, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants