Update the Cargo submodule and rustfix #52720

alexcrichton · 2018-07-26T00:26:40Z

Should hopefully bring in a few more cargo fix-related fixes.

rust-highfive · 2018-07-26T00:26:52Z

r? @nikomatsakis

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

rust-highfive · 2018-07-26T00:26:53Z

⚠️ Warning ⚠️

These commits modify submodules.

alexcrichton · 2018-07-26T00:28:06Z

cc rust-lang/cargo#5785

rust-highfive · 2018-07-26T01:10:59Z

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.

/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
  Downloading https://files.pythonhosted.org/packages/1c/95/6bf862d284c9117eb50b3832cf39780248744e2bda3bbbcd9c5f12c489bf/awscli-1.15.65-py2.py3-none-any.whl (1.3MB)
    0% |▎                               | 10kB 9.2MB/s eta 0:00:01
    1% |▌                               | 20kB 1.7MB/s eta 0:00:01
    2% |▊                               | 30kB 1.9MB/s eta 0:00:01
    3% |█                               | 40kB 2.0MB/s eta 0:00:01
---
[00:41:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/compiletest/Cargo.toml" "--features" "" "--message-format" "json"
[00:41:58] expected success, got: exit code: 101
[00:41:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:41:58] Build completed unsuccessfully in 0:00:22
[00:41:58] make: *** [check] Error 1
[00:41:58] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0109ac3a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

nikomatsakis · 2018-07-26T12:33:36Z

@bors r+

bors · 2018-07-26T12:33:37Z

📌 Commit 18c3f25bdfb62a7fb654820adb59df4a1309875b has been approved by nikomatsakis

bors · 2018-07-26T12:33:37Z

🌲 The tree is currently closed for pull requests below priority 99, this pull request will be tested once the tree is reopened

bors · 2018-07-27T03:06:23Z

⌛ Testing commit 18c3f25bdfb62a7fb654820adb59df4a1309875b with merge 3016692e401af192955b52f1f7fc0b16a232dd1d...

bors · 2018-07-27T03:24:07Z

💔 Test failed - status-travis

rust-highfive · 2018-07-27T03:24:09Z

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:14:38] * wrapping_iter_arith              lib      stable       1.14.0  
[00:14:38] * wrapping_neg                     lib      stable       1.10.0  
[00:14:38] * wrapping_next_power_of_two       lib      unstable     None    
[00:14:38] * wrapping_ref                     lib      stable       1.14.0  
[00:14:39] invalid license Unlicense OR MIT in /checkout/obj/build/tmp/distcheck/src/vendor/termcolor/Cargo.toml
[00:14:39] some tidy checks failed
[00:14:39] 
[00:14:39] 
[00:14:39] 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:14:39] 
[00:14:39] 
[00:14:39] failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
[00:14:39] Build completed unsuccessfully in 0:01:56
[00:14:39] Build completed unsuccessfully in 0:01:56
[00:14:39] make: *** [check] Error 1
[00:14:39] Makefile:58: recipe for target 'check' failed
[00:14:39] 
[00:14:39] 
[00:14:39] command did not execute successfully: "make" "check"
[00:14:39] 
[00:14:39] 
[00:14:39] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:14:39] Build completed unsuccessfully in 0:11:58
---
travis_time:end:118b35b5:start=1532661794807952092,finish=1532661794816837939,duration=8885847
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2b32562e
$ 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 -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:0d01f062
travis_time:start:0d01f062
$ 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:0a73cd4c
$ 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)

kennytm · 2018-07-27T03:42:58Z

Needs to update tidy to include the "Unlicense OR MIT" license.

[00:14:39] invalid license Unlicense OR MIT in /checkout/obj/build/tmp/distcheck/src/vendor/termcolor/Cargo.toml

alexcrichton · 2018-07-27T04:06:20Z

@bors: r=nikomatsakis

bors · 2018-07-27T04:06:21Z

📌 Commit 2407f776038413a8f45f1dfa0507d76fd91d5a59 has been approved by nikomatsakis

bors · 2018-07-27T11:02:22Z

🔒 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 update-cargo-and-rustfix (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 update-cargo-and-rustfix --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: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

alexcrichton · 2018-07-27T15:37:28Z

@bors: r=nikomatsakis

bors · 2018-07-27T15:37:29Z

📌 Commit c1cf90a03bbcf6a151debeda7eac3542c4d2f791 has been approved by nikomatsakis

bors · 2018-07-28T16:44:17Z

🔒 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 update-cargo-and-rustfix (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 update-cargo-and-rustfix --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: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Should hopefully bring in a few more `cargo fix`-related fixes.

alexcrichton · 2018-07-28T16:51:04Z

@bors: r=nikomatsakis

bors · 2018-07-28T16:51:05Z

📌 Commit fa5b3d3 has been approved by nikomatsakis

bors · 2018-07-29T01:14:45Z

⌛ Testing commit fa5b3d3 with merge 6a2c97c...

…atsakis Update the Cargo submodule and rustfix Should hopefully bring in a few more `cargo fix`-related fixes.

bors · 2018-07-29T03:20:42Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 6a2c97c to master...

rust-highfive assigned nikomatsakis Jul 26, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2018

alexcrichton force-pushed the update-cargo-and-rustfix branch from 18cbf2a to 18c3f25 Compare July 26, 2018 01:16

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 Jul 26, 2018

alexcrichton mentioned this pull request Jul 26, 2018

libc fails to migrate #51210

Closed

alexcrichton added this to the Rust 2018 Preview 2 milestone Jul 26, 2018

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 Jul 27, 2018

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 Jul 27, 2018

alexcrichton force-pushed the update-cargo-and-rustfix branch from 18c3f25 to 2407f77 Compare July 27, 2018 04:06

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 Jul 27, 2018

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2018

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 27, 2018

alexcrichton force-pushed the update-cargo-and-rustfix branch from 2407f77 to c1cf90a Compare July 27, 2018 15:37

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 Jul 27, 2018

alexcrichton mentioned this pull request Jul 28, 2018

Issue running cargo fix rust-lang/cargo#5818

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 Jul 28, 2018

Update the Cargo submodule and rustfix

fa5b3d3

Should hopefully bring in a few more `cargo fix`-related fixes.

alexcrichton force-pushed the update-cargo-and-rustfix branch from c1cf90a to fa5b3d3 Compare July 28, 2018 16:50

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 Jul 28, 2018

alexcrichton mentioned this pull request Jul 28, 2018

Multiple unused pub reexports on one line cannot be automatically fixed #52797

Closed

bors added a commit that referenced this pull request Jul 29, 2018

Auto merge of #52720 - alexcrichton:update-cargo-and-rustfix, r=nikom…

6a2c97c

…atsakis Update the Cargo submodule and rustfix Should hopefully bring in a few more `cargo fix`-related fixes.

bors merged commit fa5b3d3 into rust-lang:master Jul 29, 2018

alexcrichton deleted the update-cargo-and-rustfix branch July 31, 2018 18:47

pnkfelix mentioned this pull request Oct 9, 2018

error: internal compiler error: Accessing (*_310) with the kind Write(Move) shouldn't be possible #54597

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update the Cargo submodule and rustfix #52720

Update the Cargo submodule and rustfix #52720

alexcrichton commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

alexcrichton commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

nikomatsakis commented Jul 26, 2018

bors commented Jul 26, 2018

bors commented Jul 26, 2018

bors commented Jul 27, 2018

bors commented Jul 27, 2018

rust-highfive commented Jul 27, 2018

kennytm commented Jul 27, 2018

alexcrichton commented Jul 27, 2018

bors commented Jul 27, 2018

bors commented Jul 27, 2018

alexcrichton commented Jul 27, 2018

bors commented Jul 27, 2018

bors commented Jul 28, 2018

alexcrichton commented Jul 28, 2018

bors commented Jul 28, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018

Update the Cargo submodule and rustfix #52720

Update the Cargo submodule and rustfix #52720

Conversation

alexcrichton commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

alexcrichton commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

nikomatsakis commented Jul 26, 2018

bors commented Jul 26, 2018

bors commented Jul 26, 2018

bors commented Jul 27, 2018

bors commented Jul 27, 2018

rust-highfive commented Jul 27, 2018

kennytm commented Jul 27, 2018

alexcrichton commented Jul 27, 2018

bors commented Jul 27, 2018

bors commented Jul 27, 2018

alexcrichton commented Jul 27, 2018

bors commented Jul 27, 2018

bors commented Jul 28, 2018

alexcrichton commented Jul 28, 2018

bors commented Jul 28, 2018

bors commented Jul 29, 2018

bors commented Jul 29, 2018