Skip to content

update cargo #54334

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 22, 2018
Merged

update cargo #54334

merged 1 commit into from
Sep 22, 2018

Conversation

steveklabnik
Copy link
Member

This pulls in rust-lang/cargo#6052, which is needed for the edition preview, and will be backported to beta as well.

@rust-highfive
Copy link
Contributor

r? @aturon

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

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2018
@steveklabnik steveklabnik mentioned this pull request Sep 18, 2018
Closed
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 18, 2018

📌 Commit 30fd98b9a8ecf4e0534736ca1e87629c54b405e0 has been approved by alexcrichton

@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 Sep 18, 2018
@rust-highfive
Copy link
Contributor

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (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. 
[00:11:29] extracting /checkout/obj/build/cache/2018-09-11/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:11:29] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:29] 
[00:11:29] Caused by:
[00:11:29]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:11:29] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:11:29] Makefile:81: recipe for target 'prepare' failed
[00:11:29] make: *** [prepare] Error 1
[00:11:30] Command failed. Attempt 2/5:
[00:11:30] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:30] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:30] 
[00:11:30] Caused by:
[00:11:30]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:11:30] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:11:30] Makefile:81: recipe for target 'prepare' failed
[00:11:30] make: *** [prepare] Error 1
[00:11:32] Command failed. Attempt 3/5:
[00:11:32] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:32] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:32] 
[00:11:32] Caused by:
[00:11:32]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:11:32] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:11:32] Makefile:81: recipe for target 'prepare' failed
[00:11:32] make: *** [prepare] Error 1
[00:11:35] Command failed. Attempt 4/5:
[00:11:35] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:35] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:35] 
[00:11:35] Caused by:
[00:11:35]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:11:35] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:11:35] make: *** [prepare] Error 1
[00:11:35] Makefile:81: recipe for target 'prepare' failed
[00:11:39] Command failed. Attempt 5/5:
[00:11:39] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:39] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:11:39] 
[00:11:39] Caused by:
[00:11:39]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:11:39] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:11:39] make: *** [prepare] Error 1
[00:11:39] Makefile:81: recipe for target 'prepare' failed
[00:11:39] The command has failed after 5 attempts.
travis_time:end:0113c9dc:start=1537307385262193117,finish=1537308085251188292,duration=699988995175

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)

@steveklabnik
Copy link
Member Author

steveklabnik commented Sep 18, 2018 •
edited
Loading

Hm, that seems bad... I don't know what this means. Anyone have advice?

@Mark-Simulacrum
Copy link
Member

You'll want a cargo update -p cargo I think

@steveklabnik
Copy link
Member Author

That... makes a ton of sense. Let's try it.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 19, 2018

📌 Commit 9b8a9f4cf737a6029f46012ee8fb04c7f20940dd has been approved by alexcrichton

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Sep 19, 2018
@steveklabnik
Update Cargo
889ab28 
This pulls in rust-lang/cargo#6054, and
is a beta backport of rust-lang#54334
@steveklabnik steveklabnik mentioned this pull request Sep 19, 2018
Merged
@steveklabnik
Copy link
Member Author

Beta backport here: #54342

bors added a commit that referenced this pull request Sep 19, 2018
@bors
Auto merge of #54342 - steveklabnik:update-cargo-beta, r=Mark-Simulacrum
7a0062e 
Update Cargo

This pulls in rust-lang/cargo#6054, and
is a beta backport of #54334
@ehuss ehuss mentioned this pull request Sep 20, 2018
Closed
@alexcrichton
Copy link
Member

@bors: r+ p=1

This has a number of edition fixes for nightly now at this point

@alexcrichton alexcrichton reopened this Sep 20, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=1

@alexcrichton
Copy link
Member

@bors: r+

omg bors

@bors
Copy link
Collaborator

bors commented Sep 20, 2018

📌 Commit 7203b9a has been approved by alexcrichton

@alexcrichton
Copy link
Member

@bors: p=2

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

📌 Commit 0a822c05d2dfd583438fa78477298db446df096c has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

⌛ Testing commit 0a822c05d2dfd583438fa78477298db446df096c with merge a7ebc6711653616c920dbd8176b8eebba8737f60...

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Contributor

The job x86_64-gnu-distcheck of your PR failed on Travis (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. 
[00:17:45] * wrapping_iter_arith              lib      stable       1.14.0  
[00:17:45] * wrapping_neg                     lib      stable       1.10.0  
[00:17:45] * wrapping_next_power_of_two       lib      unstable     None    
[00:17:45] * wrapping_ref                     lib      stable       1.14.0  
[00:17:46] invalid license Apache-2.0 in /checkout/obj/build/tmp/distcheck/src/vendor/bytesize/Cargo.toml
[00:17:46] some tidy checks failed
[00:17:46] 
[00:17:46] 
[00:17:46] 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/src" "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo"
[00:17:46] 
[00:17:46] 
[00:17:46] failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
[00:17:46] Build completed unsuccessfully in 0:02:12
[00:17:46] Build completed unsuccessfully in 0:02:12
[00:17:46] Makefile:58: recipe for target 'check' failed
[00:17:46] make: *** [check] Error 1
[00:17:46] 
[00:17:46] 
[00:17:46] command did not execute successfully: "make" "check"
[00:17:46] 
[00:17:46] 
[00:17:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:17:46] Build completed unsuccessfully in 0:13:34
---
travis_time:end:11346a3f:start=1537525723946127287,finish=1537525723953254211,duration=7126924
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03080488
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0675ccd3
travis_time:start:0675ccd3
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:03ab2d84
$ dmesg | grep -i kill

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 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 Sep 21, 2018
@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 21, 2018
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

📌 Commit 5d78e005e36f260232e34baf0bc1120405be72d2 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 21, 2018
@alexcrichton
Update Cargo
8ccf112 
This commit brings in a few Cargo updates

* Updates Cargo with experimental HTTP/2 support - a post on the forums
  will be made about testing this when available.
* Bumps Cargo's own version number
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

📌 Commit 8ccf112 has been approved by alexcrichton

@ehuss ehuss mentioned this pull request Sep 21, 2018
Merged
@alexcrichton alexcrichton mentioned this pull request Sep 21, 2018
Merged
@bors
Copy link
Collaborator

bors commented Sep 22, 2018

⌛ Testing commit 8ccf112 with merge c97b60f...

bors added a commit that referenced this pull request Sep 22, 2018
@bors
Auto merge of #54334 - steveklabnik:update-cargo, r=alexcrichton
c97b60f 
update cargo

This pulls in rust-lang/cargo#6052, which is needed for the edition preview, and will be backported to beta as well.
@bors
Copy link
Collaborator

bors commented Sep 22, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing c97b60f to master...

@bors bors merged commit 8ccf112 into rust-lang:master Sep 22, 2018
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #54334!

Tested on commit c97b60f.
Direct link to PR: #54334

💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 22, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#54334!
33d60dc 
Tested on commit rust-lang/rust@c97b60f.
Direct link to PR: <rust-lang/rust#54334>

💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).
alexcrichton added a commit to alexcrichton/rls that referenced this pull request Sep 22, 2018
@alexcrichton
Update Cargo in the RLS
3b9142a 
Fixes the fallout of rust-lang/rust#54334
@alexcrichton alexcrichton mentioned this pull request Sep 22, 2018
Merged
@alexcrichton
Copy link
Member

RLS breakage should be fixed in rust-lang/rls#1063

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@steveklabnik @rust-highfive @alexcrichton @bors @Mark-Simulacrum @kennytm @aturon