Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

submodule: update rls from c9d25b to f331ff7 #58024

Merged
merged 1 commit into from
Feb 3, 2019
Merged

submodule: update rls from c9d25b to f331ff7 #58024

merged 1 commit into from
Feb 3, 2019

Conversation

h-michael
Copy link
Contributor

@h-michael h-michael commented Jan 31, 2019

Update rls rust-lang/rls@c9d25b6...e2145d

rust-lang/rls#1276 - h-michael:clippy, r=Xanewok
rust-lang/rls#1269 - rust-lang:dependabot/cargo/rand-0.6.5, r=Xanewok
Remove extra backticks in contributing.md
rust-lang/rls#1267 from h-michael/contributingmd
rust-lang/rls#1268 from matthiaskrgr/rustup
rust-lang/rls#1262 from rust-lang/dependabot/cargo/tokio-0.1.15
rust-lang/rls#1264 - h-michael:pub-crate, r=alexheretic
rust-lang/rls#1261 - rust-lang:dependabot/cargo/tokio-timer-0.2.9, r=Xanewok
rust-lang/rls#1263 - Xanewok:update-clippy, r=Xanewok
rust-lang/rls#1257 from Xanewok/architecture
rust-lang/rls#1258 - rust-lang:dependabot/cargo/lsp-types-0.55.1, r=Xanewok
rust-lang/rls#1255 - Xanewok:you-only-complete-once-fool, r=Xanewok
rust-lang/rls#1252 - rust-lang:dependabot/cargo/cargo_metadata-0.7.0, r=alexheretic
rust-lang/rls#1253 - rust-lang:dependabot/cargo/lsp-types-0.55.0, r=Xanewok
rust-lang/rls#1254 - rust-lang:dependabot/cargo/serde_json-1.0.37, r=Xanewok
dependabot: Explicitly list default allowed_updates
dependabot: Add automerge strategy for clippy_lints
rust-lang/rls#1251 - Xanewok:translate-deglob-test, r=Xanewok
rust-lang/rls#1250 from alexheretic/master
rust-lang/rls#1244 - Xanewok:translate-tests, r=alexheretic
rust-lang/rls#1247 - alexheretic:register-more-clippy, r=Xanewok
rust-lang/rls#1230 - emilio:testing-testing, r=Xanewok
rust-lang/rls#1246 from alexheretic/did-save-manifest
Merge branch 'beta-version-bump' of https://github.com/rust-lang-nursery/rls

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2019
@matthiaskrgr
Copy link
Member

r? @Xanewok

@matthiaskrgr
Copy link
Member

@h-michael you might have to update Cargo.lock as well (start x.py build, abort, add the changed Cargo.lock to the commit)

@rust-highfive
Copy link
Collaborator

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:04c002f6:start=1548940429167378583,finish=1548940430284462371,duration=1117083788
$ 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
---
##############################################                            65.0%
######################################################################## 100.0%
[00:01:55] extracting /checkout/obj/build/cache/2019-01-18/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:55]     Updating crates.io index
[00:02:05] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:05] Build completed unsuccessfully in 0:00:30
[00:02:05] Makefile:70: recipe for target 'prepare' failed
[00:02:05] make: *** [prepare] Error 1
[00:02:06] Command failed. Attempt 2/5:
[00:02:06] Command failed. Attempt 2/5:
[00:02:06]     Updating crates.io index
[00:02:07] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:07] Build completed unsuccessfully in 0:00:00
[00:02:07] make: *** [prepare] Error 1
[00:02:07] Makefile:70: recipe for target 'prepare' failed
[00:02:09] Command failed. Attempt 3/5:
[00:02:09] Command failed. Attempt 3/5:
[00:02:09]     Updating crates.io index
[00:02:09] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:09] Build completed unsuccessfully in 0:00:00
[00:02:09] make: *** [prepare] Error 1
[00:02:09] Makefile:70: recipe for target 'prepare' failed
[00:02:12] Command failed. Attempt 4/5:
[00:02:12] Command failed. Attempt 4/5:
[00:02:12]     Updating crates.io index
[00:02:13] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:13] Build completed unsuccessfully in 0:00:00
[00:02:13] make: *** [prepare] Error 1
[00:02:13] Makefile:70: recipe for target 'prepare' failed
[00:02:17] Command failed. Attempt 5/5:
[00:02:17] Command failed. Attempt 5/5:
[00:02:17]     Updating crates.io index
[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:70: recipe for target 'prepare' failed
[00:02:17] The command has failed after 5 attempts.
---
travis_time:end:30d4da9d:start=1548940581342948184,finish=1548940581348176412,duration=5228228
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1042e934
$ 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:04b44ca3
travis_time:start:04b44ca3
$ 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:0d7a0ffe
$ 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)

@nikomatsakis
Copy link
Contributor

Re-assigning to @Xanewok

@Xanewok
Copy link
Member

Xanewok commented Jan 31, 2019

@bors r+

Hoping that the tooltip tests won’t decide to hang again

@bors
Copy link
Contributor

bors commented Jan 31, 2019

📌 Commit 792e19f97999f665fce0f251415d9f0e6511e3aa has been approved by Xanewok

@bors 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 Jan 31, 2019
@Centril
Copy link
Contributor

Centril commented Jan 31, 2019

@bors p=1

@bors
Copy link
Contributor

bors commented Jan 31, 2019

⌛ Testing commit 792e19f97999f665fce0f251415d9f0e6511e3aa with merge 9f2e359e23ff11557d0d00ddf2aad0da5ec02ea3...

@bors
Copy link
Contributor

bors commented Jan 31, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

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:01:37]    Compiling serde_derive v1.0.81
[00:01:40]    Compiling toml v0.4.10
[00:01:40]    Compiling serde_json v1.0.33
[00:01:49]    Compiling bootstrap v0.0.0 (/Users/travis/build/rust-lang/rust/src/bootstrap)
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)

@bors 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 Jan 31, 2019
@h-michael
Copy link
Contributor Author

I'll try finding cause at night(UTC 20:00 +09:00)

@Xanewok
Copy link
Member

Xanewok commented Feb 1, 2019

Seems spurious

@bors retry

@bors 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 Feb 1, 2019
@bors
Copy link
Contributor

bors commented Feb 1, 2019

⌛ Testing commit 792e19f97999f665fce0f251415d9f0e6511e3aa with merge 71026128ea5fc1d5c64db76aa05de7340034a477...

@bors
Copy link
Contributor

bors commented Feb 1, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

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.
[01:45:28] test actions::hover::test::test_extract_docs_empty_line_before_decl ... ok
[01:45:28] test actions::hover::test::test_process_docs_bash_block ... ok
[01:45:28] test actions::hover::test::test_process_docs_racer_returns_extra_slashes ... ok
[01:45:28] test actions::hover::test::test_process_docs_rust_blocks ... ok
[01:45:28] test actions::notifications::test::learn_client_use_change_watched ... ok
[01:45:28] test actions::requests::test::test_sort_deglob_str ... ok
[01:45:28] test actions::hover::test::test_format_object ... ok
[01:45:28] test actions::hover::test::test_noindent ... ok
[01:45:28] test build::auto_tune_build_wait_no_config ... ok
[01:45:28] test build::auto_tune_build_wait_no_config ... ok
[01:45:28] test actions::test::test_find_word_at_pos ... ok
[01:45:28] test actions::test::file_watch_relevant_files ... ok
[01:45:28] test actions::test::did_save_relevant_files ... ok
[01:45:28] test build::dont_auto_tune_build_wait_configured ... ok
[01:45:28] test build::external::tests::dirties_transitive ... ok
[01:45:28] test build::external::tests::topological_sort ... ok
[01:45:28] test cmd::url_workaround_unc_canonicals ... ok
---
[01:45:41] 
[01:45:41] running 4 tests
[01:45:41] test test_tooltip_std ... ignored
[01:45:41] test test_tooltip_std_racer ... ignored
[01:46:41] test test_tooltip ... test test_tooltip has been running for over 60 seconds
[01:46:41] test test_tooltip_racer ... test test_tooltip_racer has been running for over 60 seconds
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)

@h-michael
Copy link
Contributor Author

I think current nightly can't build clippy.
There are same fail cases in clippy_lint CI.
https://ci.appveyor.com/project/rust-lang-libs/rust-clippy/builds/22083541

@phansch
Copy link
Member

phansch commented Feb 3, 2019

The failures should be fixed on Clippy master. You'll have to update the Clippy submodule as well now, I think?

@h-michael
Copy link
Contributor Author

@phansch OK I update clippy dependency. :)

bors added a commit to rust-lang/rls that referenced this pull request Feb 3, 2019
@h-michael
Copy link
Contributor Author

h-michael commented Feb 3, 2019

@phansch I'll also update rust clippy dependency with this PR.
#58093

@h-michael
Copy link
Contributor Author

I'll update this PR after update rust clippy revision and rls clippy revision.

@mati865
Copy link
Contributor

mati865 commented Feb 3, 2019

edit: Nevermind, I see you made another PR just for Clippy (#58093), in the future you can do it in single PR.

@h-michael Rust build system patches dependencies to use checked submodules. Clippy version in RLS repository doesn't matter here. You should just update Clippy submodule in this (Rust) repository and refresh Cargo.lock with ./x.py like you did before.

@h-michael
Copy link
Contributor Author

@mati865
Rls can't be built with current nightly because of clippy lint.
And I think we should clippy_lint of rls revision update after updating clippy of rust revision.
rust-lang/rls#1287

Do I have a something misunderstood?

@mati865
Copy link
Contributor

mati865 commented Feb 3, 2019

@h-michael Rust build system doesn't care about Clippy version set here: https://github.com/rust-lang/rls/blob/f331ff713917f6edb044c7e5c6c28c3845afebe7/Cargo.toml#L24

This line replaces clippy_lints version for all crates to the one which is checked at src/tools/clippy/clippy_lints: https://github.com/rust-lang/rust/blob/master/Cargo.toml#L71

bors added a commit that referenced this pull request Feb 3, 2019
submodule: update clippy from 6ce78d1 to 3bda548

rust-lang/rust-clippy@6ce78d1...3bda548

Rustup: unused trim result
Auto merge of #3727 - phansch:rustup_unused_trim, r=matthiaskrgr  …
Travis: Don't run integration tests on every PR commit  …
Auto merge of #3726 - phansch:some_renaming, r=oli-obk  …
Fix ICE in vec_box lint and add run-rustfix  …
Make vec_box MachineApplicable
Remove conditionals from base builds  …
Adding lint for too many lines.
Updating number of lines for the failing test to be > 100.  …
Running util/dev to update README/CHANGELOG
Reworking function logic, and adding doc example.  …
Moving tests to ui-toml to make use of clippy.toml
rustfmt
Adding back tests, but also reducing threshold by 1
Updating to just warn for one test.
Fix test broken by removing comment.
Skipping check if in external macro.
Adding lint for too many lines.
Updating number of lines for the failing test to be > 100.  …
Moving tests to ui-toml to make use of clippy.toml
rustfmt
Adding back tests, but also reducing threshold by 1
Updating to just warn for one test.
Fix test broken by removing comment.
Changing single character string to a character match.
Updated readme.
Updating code to ignore rustfmt issue.
phansch and avborhanian
Update clippy_lints/src/types.rs  …
Update clippy_lints/src/types.rs  …
Auto merge of #3732 - phansch:fix_ice_3720, r=oli-obk  …
Auto merge of #3731 - phansch:travis, r=phansch  …
Auto merge of #2857 - avborhanian:master, r=phansch  …
Fix breakage due to #58079  …
Auto merge of #3736 - mikerite:fix-build-20190203, r=phansch  …

related with: #58024
@Xanewok
Copy link
Member

Xanewok commented Feb 3, 2019

Clippy PR landed.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Feb 3, 2019

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Transition liballoc to Rust 2018 #58081

@bors
Copy link
Contributor

bors commented Feb 3, 2019

📌 Commit 6e72077 has been approved by Xanewok

@bors 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 Feb 3, 2019
@Xanewok
Copy link
Member

Xanewok commented Feb 3, 2019

@bors retry

@bors
Copy link
Contributor

bors commented Feb 3, 2019

⌛ Testing commit 6e72077 with merge f6fac42...

bors added a commit that referenced this pull request Feb 3, 2019
submodule: update rls from c9d25b to f331ff7

Update rls rust-lang/rls@c9d25b6...e2145d

rust-lang/rls#1276 - h-michael:clippy, r=Xanewok
rust-lang/rls#1269 - rust-lang:dependabot/cargo/rand-0.6.5, r=Xanewok
Remove extra backticks in contributing.md
rust-lang/rls#1267 from h-michael/contributingmd
rust-lang/rls#1268 from matthiaskrgr/rustup
rust-lang/rls#1262 from rust-lang/dependabot/cargo/tokio-0.1.15
rust-lang/rls#1264 - h-michael:pub-crate, r=alexheretic
rust-lang/rls#1261 - rust-lang:dependabot/cargo/tokio-timer-0.2.9, r=Xanewok
rust-lang/rls#1263 - Xanewok:update-clippy, r=Xanewok
rust-lang/rls#1257 from Xanewok/architecture
rust-lang/rls#1258 - rust-lang:dependabot/cargo/lsp-types-0.55.1, r=Xanewok
rust-lang/rls#1255 - Xanewok:you-only-complete-once-fool, r=Xanewok
rust-lang/rls#1252 - rust-lang:dependabot/cargo/cargo_metadata-0.7.0, r=alexheretic
rust-lang/rls#1253 - rust-lang:dependabot/cargo/lsp-types-0.55.0, r=Xanewok
rust-lang/rls#1254 - rust-lang:dependabot/cargo/serde_json-1.0.37, r=Xanewok
dependabot: Explicitly list default allowed_updates
dependabot: Add automerge strategy for clippy_lints
rust-lang/rls#1251 - Xanewok:translate-deglob-test, r=Xanewok
rust-lang/rls#1250 from alexheretic/master
rust-lang/rls#1244 - Xanewok:translate-tests, r=alexheretic
rust-lang/rls#1247 - alexheretic:register-more-clippy, r=Xanewok
rust-lang/rls#1230 - emilio:testing-testing, r=Xanewok
rust-lang/rls#1246 from alexheretic/did-save-manifest
Merge branch 'beta-version-bump' of https://github.com/rust-lang-nursery/rls
@bors
Copy link
Contributor

bors commented Feb 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Xanewok
Pushing f6fac42 to master...

@bors bors merged commit 6e72077 into rust-lang:master Feb 3, 2019
@h-michael h-michael deleted the update-rls branch February 3, 2019 23:53
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #58024!

Tested on commit f6fac42.
Direct link to PR: #58024

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 3, 2019
Tested on commit rust-lang/rust@f6fac42.
Direct link to PR: <rust-lang/rust#58024>

🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
@h-michael
Copy link
Contributor Author

Thanks for all supporting me :)

@Xanewok
Copy link
Member

Xanewok commented Feb 3, 2019

And thank you for your work!

bors added a commit to rust-lang/rls that referenced this pull request Feb 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants