Update Cargo.lock to use the latest `compiler_builtins` #57435

Dylan-DPC-zz · 2019-01-08T06:15:54Z

A very tiny PR per the request of @alexcrichton : rust-lang/compiler-builtins#267 (comment)

Rewrite of #57414

rust-highfive · 2019-01-08T06:20:05Z

The job x86_64-gnu-llvm-6.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.

travis_time:end:00eb855d:start=1546928251223379209,finish=1546928252137913966,duration=914534757
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
###################################################################       94.4%
######################################################################## 100.0%
[00:01:45] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:45]     Updating crates.io index
[00:01:54] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:54] Build completed unsuccessfully in 0:00:25
[00:01:54] make: *** [prepare] Error 1
[00:01:54] Makefile:71: recipe for target 'prepare' failed
[00:01:55] Command failed. Attempt 2/5:
[00:01:55] Command failed. Attempt 2/5:
[00:01:55]     Updating crates.io index
[00:01:55] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:55] Build completed unsuccessfully in 0:00:00
[00:01:55] make: *** [prepare] Error 1
[00:01:55] Makefile:71: recipe for target 'prepare' failed
[00:01:57] Command failed. Attempt 3/5:
[00:01:57] Command failed. Attempt 3/5:
[00:01:57]     Updating crates.io index
[00:01:58] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:58] Build completed unsuccessfully in 0:00:00
[00:01:58] make: *** [prepare] Error 1
[00:01:58] Makefile:71: recipe for target 'prepare' failed
[00:02:01] Command failed. Attempt 4/5:
[00:02:01] Command failed. Attempt 4/5:
[00:02:01]     Updating crates.io index
[00:02:01] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:01] Build completed unsuccessfully in 0:00:00
[00:02:01] make: *** [prepare] Error 1
[00:02:01] Makefile:71: recipe for target 'prepare' failed
[00:02:05] Command failed. Attempt 5/5:
[00:02:05] Command failed. Attempt 5/5:
[00:02:05]     Updating crates.io index
[00:02:06] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:06] Build completed unsuccessfully in 0:00:00
[00:02:06] make: *** [prepare] Error 1
[00:02:06] Makefile:71: recipe for target 'prepare' failed
[00:02:06] The command has failed after 5 attempts.
---
travis_time:end:31e1e41d:start=1546928391610466888,finish=1546928391615697502,duration=5230614
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0c355767
$ 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:0538ea90
travis_time:start:0538ea90
$ 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:20720ebc
$ 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)

oli-obk · 2019-01-08T10:43:14Z

Is there any particular reason why we're not bumping the version in the various Cargo.tomls? E.g. in

rust/src/liballoc/Cargo.toml

Line 14 in 7ad470c

compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }

alexcrichton · 2019-01-08T14:36:33Z

@bors: r+

@oli-obk I see that as an optional but probably recommended step, I don't think we're trying to avoid that at all.

bors · 2019-01-08T14:36:34Z

📌 Commit ef1882c58b448a004a1232c90e924b4813caa3c8 has been approved by alexcrichton

bors · 2019-01-10T06:07:04Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout fi/compiler-builtins-lock (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self fi/compiler-builtins-lock --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-01-14T04:01:43Z

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

Dylan-DPC-zz · 2019-01-19T07:07:58Z

@alexcrichton this is ready for merging

alexcrichton · 2019-01-22T17:25:59Z

@bors: r+

bors · 2019-01-22T17:25:59Z

📌 Commit a0eef7e5d99d3738542d4a505c67560c0e847c26 has been approved by alexcrichton

Centril · 2019-01-24T17:28:00Z

@bors p=7

Adjusting queue order for rollups.

bors · 2019-01-25T00:25:18Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout fi/compiler-builtins-lock (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self fi/compiler-builtins-lock --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Dylan-DPC-zz · 2019-01-25T18:34:36Z

@alexcrichton this is ready for a r+ before another PR knocks it down with a merge conflict again 😄

oli-obk · 2019-01-25T19:22:23Z

@bors r=alexcrichton p=7

bors · 2019-01-25T19:22:24Z

📌 Commit 14a38b3 has been approved by alexcrichton

bors · 2019-01-25T20:30:50Z

⌛ Testing commit 14a38b3 with merge bf669d1...

@alexcrichton

…chton Update Cargo.lock to use the latest `compiler_builtins` A very tiny PR per the request of @alexcrichton : rust-lang/compiler-builtins#267 (comment) Rewrite of #57414 cc @Lokathor r? @alexcrichton

bors · 2019-01-25T23:27:16Z

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

rust-highfive assigned alexcrichton Jan 8, 2019

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

ghost mentioned this pull request Jan 8, 2019

error: internal compiler error: src/librustc/ty/context.rs:248 "node {} with HirId::owner {:?} cannot be placed in TypeckTables with local_id_root {:?}" #57298

Closed

ghost mentioned this pull request Jan 8, 2019

"multiple matching crates for serde_derive" in test used_underscore_binding_macro rust-lang/rust-clippy#3643

Closed

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, 2019

oli-obk mentioned this pull request Jan 8, 2019

Update dependency versions in the various Cargo.tomls to the version that we actually use #57443

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 10, 2019

Dylan-DPC-zz force-pushed the fi/compiler-builtins-lock branch from ef1882c to a0eef7e Compare January 17, 2019 11:20

Dylan-DPC-zz added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 19, 2019

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 22, 2019

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 25, 2019

Lokathor and others added 3 commits January 25, 2019 12:34

Update Cargo.lock to use the latest compiler_builtins

f532dfe

The file should be fully consistent now.

49700a0

fix lock after running build

4092538

lock after rebase

14a38b3

Dylan-DPC-zz force-pushed the fi/compiler-builtins-lock branch from a0eef7e to 14a38b3 Compare January 25, 2019 09:53

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 25, 2019

bors merged commit 14a38b3 into rust-lang:master Jan 25, 2019

Dylan-DPC-zz deleted the fi/compiler-builtins-lock branch January 26, 2019 14:11

pnkfelix mentioned this pull request Mar 4, 2019

Compiler panic with associated constant #58435

Closed

oli-obk mentioned this pull request May 10, 2019

Add a repository for cargo-lockfile-sync rust-lang/compiler-team#89

Merged

xStrom mentioned this pull request May 26, 2020

Adopt a new dependency updating strategy. linebender/druid#990

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Cargo.lock to use the latest `compiler_builtins` #57435

Update Cargo.lock to use the latest `compiler_builtins` #57435

Dylan-DPC-zz commented Jan 8, 2019

rust-highfive commented Jan 8, 2019

oli-obk commented Jan 8, 2019

alexcrichton commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 10, 2019

bors commented Jan 14, 2019

Dylan-DPC-zz commented Jan 19, 2019

alexcrichton commented Jan 22, 2019

bors commented Jan 22, 2019

Centril commented Jan 24, 2019

bors commented Jan 25, 2019

Dylan-DPC-zz commented Jan 25, 2019

oli-obk commented Jan 25, 2019

bors commented Jan 25, 2019

bors commented Jan 25, 2019

bors commented Jan 25, 2019

Update Cargo.lock to use the latest compiler_builtins #57435

Update Cargo.lock to use the latest compiler_builtins #57435

Conversation

Dylan-DPC-zz commented Jan 8, 2019

rust-highfive commented Jan 8, 2019

oli-obk commented Jan 8, 2019

alexcrichton commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 10, 2019

bors commented Jan 14, 2019

Dylan-DPC-zz commented Jan 19, 2019

alexcrichton commented Jan 22, 2019

bors commented Jan 22, 2019

Centril commented Jan 24, 2019

bors commented Jan 25, 2019

Dylan-DPC-zz commented Jan 25, 2019

oli-obk commented Jan 25, 2019

bors commented Jan 25, 2019

bors commented Jan 25, 2019

bors commented Jan 25, 2019

Update Cargo.lock to use the latest `compiler_builtins` #57435

Update Cargo.lock to use the latest `compiler_builtins` #57435