Update cargo

[ehuss]

6 commits in 95b45eca19ac785263fed98ecefe540bb47337ac..0e35bd8af0ec72d3225c4819b330b94628f0e9d0
2019-03-06 19:24:30 +0000 to 2019-03-13 06:52:51 +0000

• Make hg optional for tests. (Make hg optional for tests. cargo#6739)
• Fingerprint build script deps only for path packages. (Fingerprint build script deps only for path packages. cargo#6734)
• Add --quiet option for cargo test (Add --quiet option for cargo test cargo#6358)
• .gitignore should end with a newline. (.gitignore should end with a newline. cargo#6732)
• Emit warning on misspelled environment variables (Emit warning on misspelled environment variables cargo#6694)
• Update glob requirement from 0.2.11 to 0.3.0 (Update glob requirement from 0.2.11 to 0.3.0 cargo#6724)

[rust-highfive]

r? @nikomatsakis

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

r? @alexcrichton

cc @shepmaster

[alexcrichton]

@bors: r+ p=1

[bors]

📌 Commit e3bec44 has been approved by alexcrichton

[bors]

⌛ Testing commit e3bec44 with merge 66d07c8...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

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

[01:56:38] test init::simple_git ... ok
[01:56:39] test git::warnings_in_git_dep ... ok
[01:56:39] test init::simple_git_ignore_exists ... ok
[01:56:39] test init::simple_lib ... ok
[01:56:39] test init::terminating_newline_in_existing_git_ignore ... ok
[01:56:39] test init::terminating_newline_in_existing_mercurial_ignore ... ok
[01:56:39] test init::simple_bin ... ok
[01:56:39] test init::terminating_newline_in_new_git_ignore ... ok
[01:56:39] test init::terminating_newline_in_new_mercurial_ignore ... FAILED
[01:56:39] test init::with_argument ... ok
[01:56:39] test install::bad_version ... ok
[01:56:39] test install::bad_paths ... ok
[01:56:39] test install::compile_failure ... ok
---
[01:58:47] test workspaces::ws_warn_unused ... ok
[01:58:47] 
[01:58:47] failures:
[01:58:47] 
[01:58:47] ---- init::terminating_newline_in_new_mercurial_ignore stdout ----
[01:58:47] running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo init --vcs hg --lib`
[01:58:47] thread 'init::terminating_newline_in_new_mercurial_ignore' panicked at '
[01:58:47]     but: exited with exit code: 101
[01:58:47] --- stdout
[01:58:47] 
[01:58:47] --- stderr
[01:58:47] --- stderr
[01:58:47] error: Failed to create package `t732` at `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t732/.`
[01:58:47] 
[01:58:47] Caused by:
[01:58:47]   could not execute process `hg init /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t732/.` (never executed)
[01:58:47] Caused by:
[01:58:47]   No such file or directory (os error 2)
[01:58:47] ', src/tools/cargo/tests/testsuite/support/mod.rs:796:13
[01:58:47] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:58:47] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:58:47] 
[01:58:47] 
[01:58:47] failures:
[01:58:47]     init::terminating_newline_in_new_mercurial_ignore
[01:58:47] test result: FAILED. 1538 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out
[01:58:47] 
[01:58:47] error: test failed, to rerun pass '--test testsuite'
[01:58:47] 
[01:58:47] 
[01:58:47] 
[01:58:47] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static"
[01:58:47] expected success, got: exit code: 101
[01:58:47] 
[01:58:47] 
[01:58:47] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:58:47] Build completed unsuccessfully in 0:30:34
[01:58:47] Makefile:50: recipe for target 'check-aux' failed
[01:58:47] make: *** [check-aux] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:176576a0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Mar 13 03:29:55 UTC 2019
---
travis_time:end:24b13d3e:start=1552447798155686265,finish=1552447798164805494,duration=9119229
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0a3fdc20
$ 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:start:crashlog
obj/cores/core.5145.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 5147]
[New LWP 5145]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fc71eff3428 in ?? ()
[Current thread is 1 (LWP 5147)]
#0  0x00007fc71eff3428 in ?? ()
#1  0x00007fc71eff502a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:0a3fdc20:start=1552447798170416016,finish=1552447800152574903,duration=1982158887
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:25b75fa0
travis_time:start:25b75fa0
$ 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:05dee4aa
$ 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)

[ehuss]

Proposed fix: rust-lang/cargo#6739

[dwijnand]

Merged, so this can be updated now.

[ehuss]

Updated.

[alexcrichton]

@bors: r+ delegate+

[bors]

✌️ @ehuss can now approve this pull request

[bors]

📌 Commit 712fb5e4f132ef034b0ff1da40f2fc92f1caa96e has been approved by alexcrichton

[bors]

🔒 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 update-cargo (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 update-cargo --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.

[ehuss]

@bors retry

[ehuss]

@bors r+

[bors]

📌 Commit 4543245 has been approved by ehuss

[bors]

⌛ Testing commit 4543245 with merge 719b0d9...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing 719b0d9 to master...