Update Cargo.lock to use the latest compiler_builtins

[Lokathor]

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

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[alexcrichton]

@bors: r+ rollup

[bors]

📌 Commit 77ff018279e7e246613cbc3de0683845eb5deab3 has been approved by alexcrichton

[rust-highfive]

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:0a476ea6:start=1546888651742117400,finish=1546888652689678853,duration=947561453
$ 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
---
########################################################                  78.9%
######################################################################## 100.0%
[00:02:01] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:01]     Updating crates.io index
[00:02:10] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:10] Build completed unsuccessfully in 0:00:29
[00:02:10] Makefile:71: recipe for target 'prepare' failed
[00:02:10] make: *** [prepare] Error 1
[00:02:11] Command failed. Attempt 2/5:
[00:02:11] Command failed. Attempt 2/5:
[00:02:11] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:11] Build completed unsuccessfully in 0:00:00
[00:02:11] make: *** [prepare] Error 1
[00:02:11] Makefile:71: recipe for target 'prepare' failed
[00:02:13] Command failed. Attempt 3/5:
[00:02:13] Command failed. Attempt 3/5:
[00:02:14] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:14] Build completed unsuccessfully in 0:00:00
[00:02:14] Makefile:71: recipe for target 'prepare' failed
[00:02:14] make: *** [prepare] Error 1
[00:02:17] Command failed. Attempt 4/5:
[00:02:17] Command failed. Attempt 4/5:
[00:02:17] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:17] Build completed unsuccessfully in 0:00:00
[00:02:17] make: *** [prepare] Error 1
[00:02:17] Makefile:71: recipe for target 'prepare' failed
[00:02:21] Command failed. Attempt 5/5:
[00:02:21] Command failed. Attempt 5/5:
[00:02:21] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:21] Build completed unsuccessfully in 0:00:00
[00:02:21] make: *** [prepare] Error 1
[00:02:21] Makefile:71: recipe for target 'prepare' failed
[00:02:21] The command has failed after 5 attempts.
---
travis_time:end:3409ac25:start=1546888807456094453,finish=1546888807460675662,duration=4581209
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:022c84c0
$ 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:27167c73
travis_time:start:27167c73
$ 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:007a06ac
$ 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)

[Lokathor]

@alexcrichton that failure looks above my pay grade :/

[alexcrichton]

You'll just need to run ./x.py build to the point that Cargo starts, which will update the lock file

[alexcrichton]

@bors: r+

[bors]

📌 Commit 81e4582c3dd877d50dd3d7a923e2c7346a4eb329 has been approved by alexcrichton

[bors]

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

[Lokathor]

I think I did a rebase properly? Anyone I ask about the subject of rebaseing either laughs or cries, but never seems to give a whole answer, so I don't actually know.

[tesuji]

I think I did a rebase properly? Anyone I ask about the subject of rebaseing either laughs or cries, but never seems to give a whole answer, so I don't actually know.

@Lokathor If you are in custom branch, use:

git rebase master

to rebase on master branch.

Or longer:

git rebase master <custom-branch>

Or you need to rebase interactively

git rebase -i master <custom-branch>

Note that you should use

git push -f

after rebasing to force push the new changes to remote, otherwise remote will reject it.

[Lokathor]

ho ho, I think you mean

cd dev
cd rust
git pull upstream/master
git rebase upstream/master
git pull
git rebase upstream/master
git rebase master
git pull
git status
git remote -v
git rebase upstream/master
git remote add upstream git@github.com:rust-lang/rust.git
git remove -v
git remote -v
git fetch upstream
git rebase upstream/master
git diff Cargo.lock
vim Cargo.lock
git diff --cached Cargo.lock
emacs Cargo.lock
sudo apt-get install emacs
emacs Cargo.lock
git status
./x.py build
git stauts
git status
git add Cargo.lock
git status
git rebase --continue
git status
git pull
git status
./x.py build
git status
git add Cargo.lock
git status
git commit
git push

[Lokathor]

I've been told that if I do a squash then it will safely get rid of the changes that I didn't make (all that stuff being changed that isn't Cargo.lock), but I'm afraid to do anything at this point.

[Dylan-DPC-zz]

Looks like git made a mess of this. Creating a new PR.