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

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

Open
wants to merge 4 commits into
base: master
from

Conversation

Projects
None yet
6 participants
@Dylan-DPC
Copy link
Member

Dylan-DPC commented Jan 8, 2019

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

Rewrite of #57414

cc @Lokathor

r? @alexcrichton

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 8, 2019

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

This comment has been minimized.

Copy link
Contributor

oli-obk commented Jan 8, 2019

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

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

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jan 8, 2019

@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

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit ef1882c has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 10, 2019

🔒 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:

  1. git checkout fi/compiler-builtins-lock (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. 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

This comment has been minimized.

Copy link
Contributor

bors commented Jan 14, 2019

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

@Dylan-DPC Dylan-DPC force-pushed the Dylan-DPC:fi/compiler-builtins-lock branch from ef1882c to a0eef7e Jan 17, 2019

@Dylan-DPC

This comment has been minimized.

Copy link
Member

Dylan-DPC commented Jan 19, 2019

@alexcrichton this is ready for merging

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jan 22, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 22, 2019

📌 Commit a0eef7e has been approved by alexcrichton

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment