Update RLS and Cargo by Xanewok · Pull Request #60436 · rust-lang/rust

Xanewok · 2019-05-01T10:28:20Z

Fixes the test-fail RLS toolstate caused by #59114.

rust-highfive · 2019-05-01T10:28:23Z

⚠️Warning⚠️

These commits modify submodules.

rust-highfive · 2019-05-01T12:29:59Z

The job x86_64-gnu-tools 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:2d0433a0:start=1556706575272918969,finish=1556706576033799254,duration=760880285
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:51:18] Compiling racer v2.1.22
[01:53:16] error[E0599]: no method named `as_str` found for type `&str` in the current scope
[01:53:16] --> src/tools/rls/rls/src/build/cargo.rs:203:41
[01:53:16] |
[01:53:16] 203 | .map(|pkg_spec| pkg_spec.name().as_str().to_owned())
[01:53:16] | ^^^^^^ help: there is a method with a similar name: `as_ptr`
[01:53:17] error[E0061]: this function takes 8 parameters but 7 parameters were supplied
[01:53:17] --> src/tools/rls/rls/src/project_model.rs:218:5
[01:53:17] |
[01:53:17] |
[01:53:17] 218 | ops::resolve_with_previous(registry, ws, Method::Everything, prev, None, &[], true)
[01:53:17] [01:53:17] error: aborting due to 2 previous errors
[01:53:17] [01:53:17] Some errors have detailed explanations: E0061, E0599.
---
[01:59:50] +
[01:59:50] +
[01:59:50] [01:59:50] The actual stderr differed from the expected stderr.
[01:59:50] Actual stderr saved to /tmp/compiletestbiZ3lC/async-fn.stderr
[01:59:50] To update references, run this command from build directory:
[01:59:50] tests/run-pass/update-references.sh '/tmp/compiletestbiZ3lC' 'async-fn.rs'
[01:59:50] error: 1 errors occurred comparing output.
[01:59:50] status: exit code: 1
[01:59:50] status: exit code: 1
[01:59:50] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletestbiZ3lC" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestbiZ3lC/async-fn.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-L" "/tmp/compiletestbiZ3lC/async-fn.stage-id.aux" "-A" "unused"
[01:59:50] ------------------------------------------
[01:59:50] [01:59:50] ------------------------------------------
[01:59:50] stderr:
---
[01:59:55] +For more information about this error, try `rustc --explain E0080`.
[01:59:55] +
[01:59:55] [01:59:55] The actual stderr differed from the expected stderr.
[01:59:55] Actual stderr saved to /tmp/compiletestbiZ3lC/hashmap.stderr
[01:59:55] To update references, run this command from build directory:
[01:59:55] tests/run-pass/update-references.sh '/tmp/compiletestbiZ3lC' 'hashmap.rs'
[01:59:55] error: 1 errors occurred comparing output.
[01:59:55] status: exit code: 1
[01:59:55] status: exit code: 1
[01:59:55] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/hashmap.rs" "-L" "/tmp/compiletestbiZ3lC" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestbiZ3lC/hashmap.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-Zmiri-seed=0000000000000000" "-L" "/tmp/compiletestbiZ3lC/hashmap.stage-id.aux" "-A" "unused"
[01:59:55] ------------------------------------------
[01:59:55] [01:59:55] ------------------------------------------
[01:59:55] stderr:
---
[02:00:06] Verifying status of edition-guide...
[02:00:06] Verifying status of rls...
[02:00:06] This PR updated 'src/tools/rls', verifying if status is 'test-pass'...
[02:00:06] [02:00:06] ⚠️ We detected that this PR updated 'rls', but its tests failed.
[02:00:06] [02:00:06] If you do intend to update 'rls', please check the error messages above and
[02:00:06] commit another update.
[02:00:06] [02:00:06] If you do NOT intend to update 'rls', please ensure you did not accidentally
[02:00:06] change the submodule at 'src/tools/rls'. You may ask your reviewer for the
[02:00:06] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:2a0d02c0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed May 1 12:29:54 UTC 2019

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)

Manishearth · 2019-05-01T14:42:02Z

@bors r+

bors · 2019-05-01T14:42:04Z

📌 Commit 3b24cf8 has been approved by Manishearth

ehuss · 2019-05-01T16:07:31Z

This won't work without updating cargo. I can post a PR, or you can just add the cargo update here.

Align with the version bump in rust-lang/rls#1448

Xanewok · 2019-05-02T09:54:08Z

Right, makes sense! Included the Cargo update to the version it was bumped to in rust-lang/rls#1448.

@bors r=Manishearth

bors · 2019-05-02T09:54:09Z

📌 Commit 31407e8 has been approved by Manishearth

Centril · 2019-05-02T13:01:19Z

r? @Manishearth

kennytm · 2019-05-02T14:17:51Z

@bors p=1

@Centril

Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by rust-lang#59114. r? @Centril @Manishearth

bors · 2019-05-02T20:45:09Z

⌛ Testing commit 31407e8 with merge 76e253ea206ee38d71e5a5346553236b43072508...

bors · 2019-05-03T00:45:09Z

💥 Test timed out

Xanewok · 2019-05-03T10:37:51Z

@bors retry

Manishearth · 2019-05-03T20:00:10Z

Not quite, it's fixing the potential of a security bug in an internal API on an obscure platform. The only danger there is someone committing a change to libstd in the next few days that ignores this yet-undocumented invariant, causing an actual security bug to be shipped.

It needs to be landed, but there's no rush.

Manishearth · 2019-05-03T20:43:28Z

Oh, I missed the assertion in the PR. Never mind.

bors · 2019-05-04T01:59:23Z

⌛ Testing commit 31407e8 with merge 4271bdecdf124a1cb9668e90cae977b1f1b59ca1...

bors · 2019-05-04T03:13:05Z

💔 Test failed - status-appveyor

kennytm · 2019-05-04T05:15:22Z

Something's wrong with the incremental test on 32-bit Windows.

ehuss · 2019-05-05T23:19:16Z

Can someone retry this? It shouldn't be possible for this PR to affect the incremental tests. I also built i686-pc-windows-gnu locally and the incremental tests seem fine.

Centril · 2019-05-05T23:21:17Z

@bors retry

bors · 2019-05-06T00:07:38Z

⌛ Testing commit 31407e8 with merge 6d24046cb37ed176061c8b029d5df9994eb96d87...

bors · 2019-05-06T00:16:08Z

💔 Test failed - checks-travis

rust-highfive · 2019-05-06T00:16:09Z

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.

voltdb
wry
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1557102438~hmac=052aedc5e2879661c8649ad3a8c4e6959c2161a1d30400838a7600abdf50c185&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-4qdonqVQHuRaC8OSawRkHIrYWKtRwIrGCkcIFth97DVdje1hEnE6QKyT3HZbnCZRnZNZfO00HMA2RfMMlrBZ2UTXW9-LcUQgBdMDtMrdrPL186ShiDwVim31KzystrM547jtb3WtcfA&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺 /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig: pcre
==> Installing swig dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1557102450~hmac=ddf442daeb7d8e3022a6ca0dca35019623edb77e1f8035b07312bfa57cc3b9c4&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX18IT_LVbOSyjpaDilQ-VnRMtP-fVh-m6zIkFu7x1wrNF2cYlcCNxgKRuSVuK2gQLjDcvFmR8T2LfAe726j2DK50BmaZwMfuxAe0Gy_ZWrFjmJivi0cQ98UzWBZxTyVgnxEZ-6A_zT1O2Q&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺 /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/ae/aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7?__gda__=exp=1557102453~hmac=f277a447306662210663caa5e92963e15f07b1f701232c44ea8ab014887854e4&response-content-disposition=attachment%3Bfilename%3D%22swig-4.0.0.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX19Wu9S6fx3cfsW9Gb7x_9pGbUFmzYEtWVIVFdXNDNyFSP3NdKGLOmxQSPWLCZZtuqNm3TB0Bpl1GkMK5HCuHD4OHQ5lcdroMwC0LNhx2imkfSDJ93a6H9G26nUt6nCbTD6v5VlqHJDssA&response-X-Checksum-Sha1=a9c428aee4337d91061a69c02d7ae508b627d03f&response-X-Checksum-Sha2=aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7
🍺 /usr/local/Cellar/swig/4.0.0: 722 files, 5.4MB
🍺 /usr/local/Cellar/swig/4.0.0: 722 files, 5.4MB
curl: (56) Recv failure: Connection reset by peer
The command "curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz" failed. Retrying, 2 of 3.
clang+llvm-7.0.0-x86_64-apple-darwin/bin/llc: Lzma library error: Corrupted input data
tar: Error exit delayed from previous errors.
travis_time:end:10a3c74e:start=1557101396559657000,finish=1557101752202338000,duration=355642681000
The command "case "$TRAVIS_OS_NAME" in linux) travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl && chmod +x $HOME/stamp && export PATH=$PATH:$HOME ;; osx) if [[ "$RUST_CHECK_TARGET" == dist ]]; then travis_retry brew update && travis_retry brew install xz && travis_retry brew install swig; fi && travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin && chmod +x /usr/local/bin/sccache && travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin && chmod +x /usr/local/bin/stamp && travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - && export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang && export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ && export AR=ar ;; esac" failed and exited with 1 during .
Your build has been stopped.

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 · 2019-05-06T04:07:29Z

@bors retry

Travis connection reset while updating homebrew.

bors · 2019-05-06T06:00:50Z

⌛ Testing commit 31407e8 with merge 7ac0200...

@Centril

Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by #59114. r? @Centril @Manishearth

bors · 2019-05-06T09:00:10Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing 7ac0200 to master...

rust-highfive · 2019-05-06T09:01:14Z

📣 Toolstate changed by #60436!

Tested on commit 7ac0200.
Direct link to PR: #60436

🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

@Xanewok

Tested on commit rust-lang/rust@7ac0200. Direct link to PR: <rust-lang/rust#60436> 🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra). 🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

Update RLS
3b24cf8

rust-highfive assigned Centril May 1, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2019

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 May 1, 2019

Update Cargo
31407e8
Align with the version bump in rust-lang/rls#1448

Xanewok changed the title ~~Update RLS~~Update RLS and CargoMay 2, 2019

rust-highfive assigned Manishearth and unassigned Centril May 2, 2019

kennytm added a commit to kennytm/rust that referenced this pull request May 2, 2019
Rollup merge ofrust-lang#60436- Xanewok:update-rls, r=Manishearth
acb25d7
Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by rust-lang#59114. r? @Centril @Manishearth

kennytm mentioned this pull request May 2, 2019
Rollup of 7 pull requests #60472
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 May 3, 2019

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 May 3, 2019

Centril mentioned this pull request May 3, 2019
Rollup of 7 pull requests #60523
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 May 4, 2019

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 May 5, 2019

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 May 6, 2019

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 May 6, 2019

bors added a commit that referenced this pull request May 6, 2019
Auto merge of#60436- Xanewok:update-rls, r=Manishearth
7ac0200
Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by #59114. r? @Centril @Manishearth

bors added the merged-by-bors This PR was explicitly merged by bors. label May 6, 2019

bors merged commit 31407e8 into rust-lang:masterMay 6, 2019

Xanewok deleted the update-rls branch May 7, 2019 18:34

Uh oh!

Uh oh!

Conversation

Xanewok commented May 1, 2019

Uh oh!

rust-highfive commented May 1, 2019

Uh oh!

rust-highfive commented May 1, 2019

Uh oh!

Manishearth commented May 1, 2019

Uh oh!

bors commented May 1, 2019

Uh oh!

ehuss commented May 1, 2019

Uh oh!

Xanewok commented May 2, 2019

Uh oh!

bors commented May 2, 2019

Uh oh!

Centril commented May 2, 2019

Uh oh!

kennytm commented May 2, 2019

Uh oh!

bors commented May 2, 2019

Uh oh!

bors commented May 3, 2019

Uh oh!

Xanewok commented May 3, 2019

Uh oh!

Manishearth commented May 3, 2019

Uh oh!

Manishearth commented May 3, 2019

Uh oh!

bors commented May 4, 2019

Uh oh!

bors commented May 4, 2019

Uh oh!

kennytm commented May 4, 2019

Uh oh!

ehuss commented May 5, 2019

Uh oh!

Centril commented May 5, 2019

Uh oh!

bors commented May 6, 2019

Uh oh!

bors commented May 6, 2019

Uh oh!

rust-highfive commented May 6, 2019

Uh oh!

kennytm commented May 6, 2019

Uh oh!

bors commented May 6, 2019

Uh oh!

bors commented May 6, 2019

Uh oh!

rust-highfive commented May 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants