Update Cargo submodule#53567

alexcrichton · 2018-08-21T17:25:04Z

Also update Cargo's dependencies while we're at it

rust-highfive · 2018-08-21T17:25:07Z

r? @aturon

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

rust-highfive · 2018-08-21T17:25:08Z

⚠️ Warning ⚠️

These commits modify submodules.

alexcrichton · 2018-08-21T17:27:03Z

r? @Mark-Simulacrum

rust-highfive · 2018-08-21T17:40:43Z

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.

[00:02:36]  Downloading proc-macro2 v0.4.13
[00:02:36]  Downloading syn v0.14.8
[00:02:36]  Downloading quote v0.6.6
[00:02:36]  Downloading unicode-xid v0.1.0
[00:02:36]  Downloading ryu v0.2.4
[00:02:37]  Downloading cfg-if v0.1.5
[00:02:37]    Compiling proc-macro2 v0.4.13
[00:02:37]    Compiling unicode-xid v0.1.0
[00:02:37]    Compiling serde v1.0.72
[00:02:37]    Compiling serde v1.0.72
[00:02:37]    Compiling ryu v0.2.4
[00:02:37]    Compiling ordermap v0.3.5
[00:02:37]    Compiling cc v1.0.19
[00:02:37]    Compiling fixedbitset v0.1.9
[00:02:37]    Compiling cfg-if v0.1.5
---
travis_time:start:stage0-tidy
Building stage0 tool tidy (x86_64-unknown-linux-gnu)
[00:03:53]    Compiling proc-macro2 v0.4.13
[00:03:53]    Compiling unicode-xid v0.1.0
[00:03:53]    Compiling ryu v0.2.4
[00:03:53]    Compiling itoa v0.4.2
[00:03:58]    Compiling quote v0.6.6
[00:03:58]    Compiling syn v0.14.8
[00:04:06]    Compiling serde_json v1.0.26
---
[00:04:42] * version_check 
[00:04:42] some tidy checks failed
[00:04:42] 
[00:04:42] 
[00:04:42] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:42] 
[00:04:42] 
[00:04:42] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:42] Build completed unsuccessfully in 0:00:50
[00:04:42] Build completed unsuccessfully in 0:00:50
[00:04:42] Makefile:79: recipe for target 'tidy' failed
[00:04:42] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0ec371f6
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0a31d984:start=1534872728843148954,finish=1534872728851543356,duration=8394402
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0d8573b2
$ 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:151cd4d8
travis_time:start:151cd4d8
$ 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:191d691b
$ 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)

bors · 2018-08-22T22:17:40Z

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

alexcrichton · 2018-08-22T22:31:19Z

ping r? @Mark-Simulacrum

Mark-Simulacrum · 2018-08-22T22:33:12Z

@bors r+

Too many Cargo.lock changes...

bors · 2018-08-22T22:33:13Z

📌 Commit ecc7f1aa9e3b108a0944cb66a1e18a12a58598cb has been approved by Mark-Simulacrum

alexcrichton · 2018-08-23T07:34:21Z

@bors: r=Mark-Simulacrum

bors · 2018-08-23T07:34:22Z

📌 Commit c32f2e63a07cba392303ab94a077f9eb1bb85cb3 has been approved by Mark-Simulacrum

bors · 2018-08-23T14:18:26Z

⌛ Testing commit c32f2e63a07cba392303ab94a077f9eb1bb85cb3 with merge 039dfe5ad7d684001f7a4481e6dd092b28a5e9fb...

bors · 2018-08-23T14:40:17Z

💔 Test failed - status-travis

rust-highfive · 2018-08-23T14:40:19Z

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:02:07]  Downloading cc v1.0.20
[00:02:08]  Downloading petgraph v0.4.12
[00:02:08]  Downloading serde_derive v1.0.72
[00:02:08]  Downloading getopts v0.2.17
[00:02:08]  Downloading ryu v0.2.4
[00:02:08]  Downloading cfg-if v0.1.5
[00:02:08]  Downloading fixedbitset v0.1.9
[00:02:08]  Downloading ordermap v0.3.5
[00:02:08]  Downloading proc-macro2 v0.4.13
[00:02:08]  Downloading proc-macro2 v0.4.13
[00:02:08]  Downloading quote v0.6.8
[00:02:08]  Downloading syn v0.14.9
[00:02:08]  Downloading unicode-xid v0.1.0
[00:02:08]    Compiling proc-macro2 v0.4.13
[00:02:08]    Compiling unicode-xid v0.1.0
[00:02:08]    Compiling serde v1.0.72
[00:02:08]    Compiling ryu v0.2.4
[00:02:09]    Compiling cfg-if v0.1.5
[00:02:09]    Compiling cc v1.0.20
[00:02:09]    Compiling itoa v0.4.2
[00:02:09]    Compiling libc v0.2.43
---
######################################################################## 100.0%
[00:16:00] extracting /checkout/obj/build/tmp/distcheck/build/cache/2018-08-01/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:16:01]    Compiling proc-macro2 v0.4.13
[00:16:01]    Compiling unicode-xid v0.1.0
[00:16:01]    Compiling ryu v0.2.4
[00:16:01]    Compiling cc v1.0.20
[00:16:01]    Compiling libc v0.2.43
[00:16:01]    Compiling cfg-if v0.1.5
[00:16:01]    Compiling itoa v0.4.2
---
travis_time:start:stage0-tidy
Building stage0 tool tidy (x86_64-unknown-linux-gnu)
[00:17:02]    Compiling proc-macro2 v0.4.13
[00:17:02]    Compiling unicode-xid v0.1.0
[00:17:02]    Compiling ryu v0.2.4
[00:17:02]    Compiling itoa v0.4.2
[00:17:03] [RUSTC-TIMING] itoa test:false 0.339
[00:17:03] [RUSTC-TIMING] itoa test:false 0.339
[00:17:04] [RUSTC-TIMING] ryu test:false 0.807
[00:17:09]    Compiling syn v0.14.9
[00:17:16] [RUSTC-TIMING] serde test:false 12.460
[00:17:16]    Compiling serde_json v1.0.26
[00:17:24]    Compiling serde_derive v1.0.72
---
[00:17:53] * wrapping_iter_arith              lib      stable       1.14.0  
[00:17:53] * wrapping_neg                     lib      stable       1.10.0  
[00:17:53] * wrapping_next_power_of_two       lib      unstable     None    
[00:17:53] * wrapping_ref                     lib      stable       1.14.0  
[00:17:54] invalid license Apache-2.0 in /checkout/obj/build/tmp/distcheck/src/vendor/ryu/Cargo.toml
[00:17:54] some tidy checks failed
[00:17:54] 
[00:17:54] 
[00:17:54] 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:17:54] 
[00:17:54] 
[00:17:54] failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
[00:17:54] Build completed unsuccessfully in 0:02:06
[00:17:54] Build completed unsuccessfully in 0:02:06
[00:17:54] Makefile:58: recipe for target 'check' failed
[00:17:54] make: *** [check] Error 1
[00:17:54] 
[00:17:54] 
[00:17:54] command did not execute successfully: "make" "check"
[00:17:54] 
[00:17:54] 
[00:17:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:17:54] Build completed unsuccessfully in 0:14:33
---
travis_time:end:12f18460:start=1535035124237549779,finish=1535035124244337096,duration=6787317
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:29eef088
$ 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:009f2892
travis_time:start:009f2892
$ 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:04854b1e
$ 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)

alexcrichton · 2018-08-23T16:30:42Z

@bors: r=Mark-Simulacrum

bors · 2018-08-23T16:30:43Z

📌 Commit abc259af72797a0971b55d2e101b9131691c631e has been approved by Mark-Simulacrum

rust-lang/rust#53567

bors · 2018-08-25T19:30:06Z

💔 Test failed - status-travis

rust-highfive · 2018-08-25T19:30:08Z

The job dist-x86_64-apple-alt 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:03:37]       Memory: 8 GB
[00:03:37]       Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:03:37]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:37]       SMC Version (system): 2.8f0
[00:03:37]       Serial Number (system): VMIPag3feKJm
[00:03:37] 
[00:03:37] hw.ncpu: 4
[00:03:37] hw.byteorder: 1234
[00:03:37] hw.memsize: 8589934592
---
[01:04:41]    |
[01:04:41] 22 | use syntax::codemap::{FileLoader, RealFileLoader};
[01:04:41]    |             ^^^^^^^ Could not find `codemap` in `syntax`
[01:04:41] 
[01:04:41] warning: unused import: `json_internal`
[01:04:41]    |
[01:04:41]    |
[01:04:41] 18 | use serde_json::{self, json, json_internal};
[01:04:41]    |
[01:04:41]    = note: #[warn(unused_imports)] on by default
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/mod.rs:23:18
[01:04:41]    |
[01:04:41] 23 | use log::{debug, log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]  --> tools/rls/src/actions/work_pool.rs:7:17
[01:04:41]   |
[01:04:41]   |
[01:04:41] 7 | use log::{info, log, warn};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/post_build.rs:31:11
[01:04:41]    |
[01:04:41]    |
[01:04:41] 31 | use log::{log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/requests.rs:23:18
[01:04:41]    |
[01:04:41]    |
[01:04:41] 23 | use log::{debug, log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:123:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 123 |         let file_path = parse_file_path!(&params.text_document.uri, "symbols")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:183:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 183 |         let file_path = parse_file_path!(&params.text_document.uri, "find_impls")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:218:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 218 |         let file_path = parse_file_path!(&params.text_document.uri, "goto_def")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:274:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 274 |         let file_path = parse_file_path!(&params.text_document.uri, "find_all_refs")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:309:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 309 |         let file_path = parse_file_path!(&params.text_document.uri, "complete")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:349:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 349 |         let file_path = parse_file_path!(&params.text_document.uri, "highlight")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:393:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 393 |         let file_path = parse_file_path!(&params.text_document.uri, "rename")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:655:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 655 |         let file_path = parse_file_path!(&params.text_document.uri, "code_action")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:723:16
[01:04:41]     |
[01:04:41]     |
[01:04:41] 723 |     let path = parse_file_path!(&doc.uri, "reformat")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/requests.rs:874:29
[01:04:41]     |
[01:04:41]     |
[01:04:41] 874 |             let file_path = parse_file_path!(&params.text_document.uri, "code_lens")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/notifications.rs:21:18
[01:04:41]    |
[01:04:41]    |
[01:04:41] 21 | use log::{debug, log, trace, warn};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]    |
[01:04:41]    |
[01:04:41] 46 |             use log::{log, trace};
[01:04:41]    | 
[01:04:41]   ::: tools/rls/src/actions/notifications.rs:69:25
[01:04:41]    |
[01:04:41]    |
[01:04:41] 69 |         let file_path = parse_file_path!(&params.text_document.uri, "on_open")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]    |
[01:04:41]    |
[01:04:41] 46 |             use log::{log, trace};
[01:04:41]    | 
[01:04:41]   ::: tools/rls/src/actions/notifications.rs:89:25
[01:04:41]    |
[01:04:41]    |
[01:04:41] 89 |         let file_path = parse_file_path!(&params.text_document.uri, "on_change")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/notifications.rs:249:25
[01:04:41]     |
[01:04:41]     |
[01:04:41] 249 |         let file_path = parse_file_path!(&params.text_document.uri, "on_save")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/actions/diagnostics.rs:27:18
[01:04:41]    |
[01:04:41]    |
[01:04:41] 27 | use log::{debug, log};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]  --> tools/rls/src/actions/run.rs:7:11
[01:04:41]   |
[01:04:41]   |
[01:04:41] 7 | use log::{log, error};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]    --> tools/rls/src/actions/mod.rs:46:23
[01:04:41]     |
[01:04:41]     |
[01:04:41] 46  |             use log::{log, trace};
[01:04:41]     | 
[01:04:41]     | 
[01:04:41]    ::: tools/rls/src/actions/hover.rs:862:27
[01:04:41]     |
[01:04:41] 862 |     let hover_file_path = parse_file_path!(&params.text_document.uri, "hover")?;
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/build/mod.rs:21:11
[01:04:41]    |
[01:04:41]    |
[01:04:41] 21 | use log::{log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/build/cargo.rs:26:25
[01:04:41]    |
[01:04:41]    |
[01:04:41] 26 | use log::{debug, error, log, trace, warn};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/build/rustc.rs:25:11
[01:04:41]    |
[01:04:41]    |
[01:04:41] 25 | use log::{log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/build/plan.rs:42:11
[01:04:41]    |
[01:04:41]    |
[01:04:41] 42 | use log::{log, trace, error};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/config.rs:29:11
[01:04:41]    |
[01:04:41]    |
[01:04:41] 29 | use log::{log, trace};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/server/mod.rs:43:25
[01:04:41]    |
[01:04:41]    |
[01:04:41] 43 | use log::{debug, error, log, trace, warn};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/server/dispatch.rs:22:18
[01:04:41]    |
[01:04:41]    |
[01:04:41] 22 | use log::{debug, log};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/server/io.rs:13:25
[01:04:41]    |
[01:04:41]    |
[01:04:41] 13 | use log::{debug, trace, log};
[01:04:41] 
[01:04:41] warning: unused import: `log`
[01:04:41]   --> tools/rls/src/server/message.rs:20:18
[01:04:41]    |
[01:04:41]    |
[01:04:41] 20 | use log::{debug, log};
[01:04:41] 
[01:04:41] error: aborting due to previous error
[01:04:41] 
[01:04:41] Some errors occurred: E0432, E0705.
---
[01:20:33]    |
[01:20:33] 22 | use syntax::codemap::{FileLoader, RealFileLoader};
[01:20:33]    |             ^^^^^^^ Could not find `codemap` in `syntax`
[01:20:33] 
[01:20:33] warning: unused import: `json_internal`
[01:20:33]    |
[01:20:33]    |
[01:20:33] 18 | use serde_json::{self, json, json_internal};
[01:20:33]    |
[01:20:33]    = note: #[warn(unused_imports)] on by default
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/mod.rs:23:18
[01:20:33]    |
[01:20:33] 23 | use log::{debug, log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]  --> tools/rls/src/actions/work_pool.rs:7:17
[01:20:33]   |
[01:20:33]   |
[01:20:33] 7 | use log::{info, log, warn};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/post_build.rs:31:11
[01:20:33]    |
[01:20:33]    |
[01:20:33] 31 | use log::{log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/requests.rs:23:18
[01:20:33]    |
[01:20:33]    |
[01:20:33] 23 | use log::{debug, log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:123:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 123 |         let file_path = parse_file_path!(&params.text_document.uri, "symbols")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:183:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 183 |         let file_path = parse_file_path!(&params.text_document.uri, "find_impls")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:218:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 218 |         let file_path = parse_file_path!(&params.text_document.uri, "goto_def")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:274:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 274 |         let file_path = parse_file_path!(&params.text_document.uri, "find_all_refs")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:309:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 309 |         let file_path = parse_file_path!(&params.text_document.uri, "complete")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:349:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 349 |         let file_path = parse_file_path!(&params.text_document.uri, "highlight")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:393:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 393 |         let file_path = parse_file_path!(&params.text_document.uri, "rename")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:655:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 655 |         let file_path = parse_file_path!(&params.text_document.uri, "code_action")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:723:16
[01:20:33]     |
[01:20:33]     |
[01:20:33] 723 |     let path = parse_file_path!(&doc.uri, "reformat")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/requests.rs:874:29
[01:20:33]     |
[01:20:33]     |
[01:20:33] 874 |             let file_path = parse_file_path!(&params.text_document.uri, "code_lens")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/notifications.rs:21:18
[01:20:33]    |
[01:20:33]    |
[01:20:33] 21 | use log::{debug, log, trace, warn};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]    |
[01:20:33]    |
[01:20:33] 46 |             use log::{log, trace};
[01:20:33]    | 
[01:20:33]   ::: tools/rls/src/actions/notifications.rs:69:25
[01:20:33]    |
[01:20:33]    |
[01:20:33] 69 |         let file_path = parse_file_path!(&params.text_document.uri, "on_open")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]    |
[01:20:33]    |
[01:20:33] 46 |             use log::{log, trace};
[01:20:33]    | 
[01:20:33]   ::: tools/rls/src/actions/notifications.rs:89:25
[01:20:33]    |
[01:20:33]    |
[01:20:33] 89 |         let file_path = parse_file_path!(&params.text_document.uri, "on_change")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/notifications.rs:249:25
[01:20:33]     |
[01:20:33]     |
[01:20:33] 249 |         let file_path = parse_file_path!(&params.text_document.uri, "on_save")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/actions/diagnostics.rs:27:18
[01:20:33]    |
[01:20:33]    |
[01:20:33] 27 | use log::{debug, log};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]  --> tools/rls/src/actions/run.rs:7:11
[01:20:33]   |
[01:20:33]   |
[01:20:33] 7 | use log::{log, error};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]    --> tools/rls/src/actions/mod.rs:46:23
[01:20:33]     |
[01:20:33]     |
[01:20:33] 46  |             use log::{log, trace};
[01:20:33]     | 
[01:20:33]     | 
[01:20:33]    ::: tools/rls/src/actions/hover.rs:862:27
[01:20:33]     |
[01:20:33] 862 |     let hover_file_path = parse_file_path!(&params.text_document.uri, "hover")?;
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/build/mod.rs:21:11
[01:20:33]    |
[01:20:33]    |
[01:20:33] 21 | use log::{log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/build/cargo.rs:26:25
[01:20:33]    |
[01:20:33]    |
[01:20:33] 26 | use log::{debug, error, log, trace, warn};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/build/rustc.rs:25:11
[01:20:33]    |
[01:20:33]    |
[01:20:33] 25 | use log::{log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/build/plan.rs:42:11
[01:20:33]    |
[01:20:33]    |
[01:20:33] 42 | use log::{log, trace, error};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/config.rs:29:11
[01:20:33]    |
[01:20:33]    |
[01:20:33] 29 | use log::{log, trace};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/server/mod.rs:43:25
[01:20:33]    |
[01:20:33]    |
[01:20:33] 43 | use log::{debug, error, log, trace, warn};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/server/dispatch.rs:22:18
[01:20:33]    |
[01:20:33]    |
[01:20:33] 22 | use log::{debug, log};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/server/io.rs:13:25
[01:20:33]    |
[01:20:33]    |
[01:20:33] 13 | use log::{debug, trace, log};
[01:20:33] 
[01:20:33] warning: unused import: `log`
[01:20:33]   --> tools/rls/src/server/message.rs:20:18
[01:20:33]    |
[01:20:33]    |
[01:20:33] 20 | use log::{debug, log};
[01:20:33] 
[01:20:34] error: aborting due to previous error
[01:20:34] 
[01:20:34] Some errors occurred: E0432, E0705.
---
travis_fold:end:dpl_1
travis_time:start:054e1c05
travis_fold:start:dpl.1
Installing deploy dependencies
ERROR:  Could not find a valid gem 'dpl-s3' (= 1.10.0), here is why:
          Unable to download data from https://rubygems.org/ - no such name (https://rubygems.org/specs.4.8.gz)
/Users/travis/.rvm/rubies/ruby-2.4.2/lib/ruby/2.4.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- dpl/provider/s3 (LoadError)
 from /Users/travis/.rvm/rubies/ruby-2.4.2/lib/ruby/2.4.0/rubygems/core_ext/kernel_require.rb:55:in `require'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/provider.rb:94:in `rescue in block in new'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/provider.rb:69:in `block in new'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/cli.rb:41:in `fold'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/provider.rb:68:in `new'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/cli.rb:31:in `run'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/lib/dpl/cli.rb:7:in `run'
 from /Users/travis/.rvm/gems/ruby-2.4.2/gems/dpl-1.10.0/bin/dpl:5:in `<top (required)>'
 from /Users/travis/.rvm/gems/ruby-2.4.2/bin/dpl:23:in `load'
 from /Users/travis/.rvm/gems/ruby-2.4.2/bin/dpl:23:in `<main>'
failed to deploy
failed to deploy
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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)

alexcrichton · 2018-08-25T19:59:09Z

@bors: retry

bors · 2018-08-25T21:38:08Z

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

bors · 2018-08-25T21:44:58Z

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

Also update Cargo's dependencies while we're at it

alexcrichton · 2018-08-25T23:26:47Z

@bors: r=Mark-Simulacrum

bors · 2018-08-25T23:26:47Z

📌 Commit 2863b75 has been approved by Mark-Simulacrum

bors · 2018-08-26T00:58:14Z

⌛ Testing commit 2863b75 with merge 36f14b9...

Update Cargo submodule Also update Cargo's dependencies while we're at it

bors · 2018-08-26T03:04:52Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 36f14b9 to master...

rust-highfive assigned aturon Aug 21, 2018

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

rust-highfive assigned Mark-Simulacrum and unassigned aturon Aug 21, 2018

alexcrichton force-pushed the update-cargo branch from 531e3bc to ea15a4c Compare August 22, 2018 17:58

alexcrichton force-pushed the update-cargo branch from ea15a4c to ecc7f1a Compare August 22, 2018 22:31

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 Aug 22, 2018

alexcrichton force-pushed the update-cargo branch from ecc7f1a to c32f2e6 Compare August 23, 2018 07:33

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 Aug 23, 2018

alexcrichton force-pushed the update-cargo branch from c32f2e6 to abc259a Compare August 23, 2018 16:30

alexcrichton closed this Aug 23, 2018

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 23, 2018

kennytm mentioned this pull request Aug 25, 2018

Update RLS #53701

Merged

Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 25, 2018

Bump cargo to match Rust CI

a8dda00

rust-lang/rust#53567

Xanewok mentioned this pull request Aug 25, 2018

Bump cargo to match Rust CI rust-lang/rls#1015

Closed

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 Aug 25, 2018

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 Aug 25, 2018

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 Aug 25, 2018

Update Cargo submodule

2863b75

Also update Cargo's dependencies while we're at it

alexcrichton force-pushed the update-cargo branch from 9aa9e77 to 2863b75 Compare August 25, 2018 23:26

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 Aug 25, 2018

bors added a commit that referenced this pull request Aug 26, 2018

Auto merge of #53567 - alexcrichton:update-cargo, r=Mark-Simulacrum

36f14b9

Update Cargo submodule Also update Cargo's dependencies while we're at it

bors merged commit 2863b75 into rust-lang:master Aug 26, 2018

This was referenced Aug 26, 2018

Update Cargo.lock #53075

Merged

Miri engine cleanup #53671

Merged

add more Cortex-R targets #53679

Merged

alexcrichton deleted the update-cargo branch August 26, 2018 19:49

cuviper mentioned this pull request Sep 17, 2018

powerpc-unknown-linux-gnu fails to compile simple crates #50960

Closed

Uh oh!

Conversation

alexcrichton commented Aug 21, 2018

Uh oh!

rust-highfive commented Aug 21, 2018

Uh oh!

rust-highfive commented Aug 21, 2018

Uh oh!

alexcrichton commented Aug 21, 2018

Uh oh!

rust-highfive commented Aug 21, 2018

Uh oh!

bors commented Aug 22, 2018

Uh oh!

alexcrichton commented Aug 22, 2018

Uh oh!

Mark-Simulacrum commented Aug 22, 2018

Uh oh!

bors commented Aug 22, 2018

Uh oh!

alexcrichton commented Aug 23, 2018

Uh oh!

bors commented Aug 23, 2018

Uh oh!

bors commented Aug 23, 2018

Uh oh!

bors commented Aug 23, 2018

Uh oh!

rust-highfive commented Aug 23, 2018

Uh oh!

alexcrichton commented Aug 23, 2018

Uh oh!

bors commented Aug 23, 2018

Uh oh!

bors commented Aug 25, 2018

Uh oh!

rust-highfive commented Aug 25, 2018

Uh oh!

alexcrichton commented Aug 25, 2018

Uh oh!

bors commented Aug 25, 2018

Uh oh!

bors commented Aug 25, 2018

Uh oh!

alexcrichton commented Aug 25, 2018

Uh oh!

bors commented Aug 25, 2018

Uh oh!

bors commented Aug 26, 2018

Uh oh!

bors commented Aug 26, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants