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.

Sign up for GitHub

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

Jump to bottom

submodules: update rls #53610

Closed
wants to merge 1 commit into from
Closed

submodules: update rls #53610

wants to merge 1 commit into from

Conversation

matthiaskrgr
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 Aug 22, 2018
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 22, 2018

📌 Commit 4572b84446aa1587f123700cc5dff4e1278fb317 has been approved by alexcrichton

@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 Aug 22, 2018
@matthiaskrgr
Copy link
Member Author

There was no nightly released because of bad toolstate (rls failed to build)
https://rust-lang-nursery.github.io/rust-toolstate/
rls failed to build because its clippy-lints dependency failed to build.
I updated the clippy-lints dep of rls to a state that is compatible with current rustc so hopefully this commit fixes the toolstate.
Or maybe I am misunderstanding things...

@matthiaskrgr matthiaskrgr mentioned this pull request Aug 22, 2018
Closed
@nrc
Copy link
Member

nrc commented Aug 22, 2018

Is this updating to a branch? Because if not I think it won't work - building master RLS locally with the latest Rust commit fails in Clippy

@matthiaskrgr
Copy link
Member Author

Yeah ... clippy just rebroke ... :(
#53581 (comment)

I'll see if I can get this fixed.

@alexcrichton
Copy link
Member

@bors: r-

ah ok, removing from the queue in the meantime!

Also...

r? @nrc

@bors 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 22, 2018
@matthiaskrgr
Copy link
Member Author

I updated again, should get rls to the same state as #53638

@matthiaskrgr matthiaskrgr mentioned this pull request Aug 23, 2018
Closed
@nrc
Copy link
Member

nrc commented Aug 23, 2018

@bors: r+ p=10

@bors
Copy link
Contributor

bors commented Aug 23, 2018

📌 Commit ba71a79c36edfdd16ce5d6a8b5d0b5fe2de4182d has been approved by nrc

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 23, 2018
@matthiaskrgr matthiaskrgr changed the title submodules: update rls to b6cdf4af930ee495a010bd3ade9460d3bbf0bd52 submodules: update rls Aug 23, 2018
@rust-highfive
Copy link
Collaborator

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. 
##################################################                        69.8%
######################################################################## 100.0%
[00:01:58] extracting /checkout/obj/build/cache/2018-08-01/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:00]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:23] error: the lock file needs to be updated but --locked was passed to prevent this
[00:02:23] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:23] Makefile:81: recipe for target 'prepare' failed
[00:02:23] make: *** [prepare] Error 1
[00:02:24] Command failed. Attempt 2/5:
[00:02:24]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:24]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:25] error: the lock file needs to be updated but --locked was passed to prevent this
[00:02:25] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:25] Makefile:81: recipe for target 'prepare' failed
[00:02:25] make: *** [prepare] Error 1
[00:02:27] Command failed. Attempt 3/5:
[00:02:27]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:27]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:27] error: the lock file needs to be updated but --locked was passed to prevent this
[00:02:27] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:27] Makefile:81: recipe for target 'prepare' failed
[00:02:27] make: *** [prepare] Error 1
[00:02:30] Command failed. Attempt 4/5:
[00:02:30]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:30]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:31] error: the lock file needs to be updated but --locked was passed to prevent this
[00:02:31] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:31] Makefile:81: recipe for target 'prepare' failed
[00:02:31] make: *** [prepare] Error 1
[00:02:35] Command failed. Attempt 5/5:
[00:02:35]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:35]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:02:35] error: the lock file needs to be updated but --locked was passed to prevent this
[00:02:35] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:35] Makefile:81: recipe for target 'prepare' failed
[00:02:35] make: *** [prepare] Error 1
[00:02:35] The command has failed after 5 attempts.
travis_time:end:0dcfbeea:start=1535064729664454389,finish=1535064891877610796,duration=162213156407
---
travis_time:end:006157ad:start=1535064892370594622,finish=1535064892383636310,duration=13041688
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:05f3b9cd
$ 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:039d02b7
travis_time:start:039d02b7
$ 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:01edb894
$ 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)

@nrc
Copy link
Member

nrc commented Aug 23, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 23, 2018

📌 Commit 493a5ca34a0dfbb2f7832b2265f55b5027c80277 has been approved by nrc

@kennytm 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 Aug 24, 2018
@matthiaskrgr
Copy link
Member Author

Fixed via rust-lang/rls#1010 and rebased.

@kennytm
Copy link
Member

kennytm commented Aug 24, 2018

@matthiaskrgr how about json_internal!?

@matthiaskrgr
Copy link
Member Author

@kennytm I can't reproduce this one locally anymore,

I tried:

cargo +master build
cargo +master build --all-targets
cargo +master build --all-features
cargo +master build --all-features --all-targets

but all passed.
If you have any ideas please let me know!

@kennytm
Copy link
Member

kennytm commented Aug 24, 2018

Let's see what bors think then.

@bors r=nrc

@bors
Copy link
Contributor

bors commented Aug 24, 2018

📌 Commit 6c034fa has been approved by nrc

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 24, 2018
@bors
Copy link
Contributor

bors commented Aug 24, 2018

⌛ Testing commit 6c034fa with merge e2b95da305eb10849938f27f7e3d78d2fa172676...

@Xanewok Xanewok mentioned this pull request Aug 24, 2018
Closed
@bors
Copy link
Contributor

bors commented Aug 24, 2018

💔 Test failed - status-appveyor

@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 Aug 24, 2018
@kennytm
Copy link
Member

kennytm commented Aug 24, 2018

Looks like the error is only reproducible on Windows.

@kennytm 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 Aug 24, 2018
@matthiaskrgr
Copy link
Member Author

Ok, then there is nothing I can do about it since I don't have a windows machine.
I'll leave this to someone else then...

@Xanewok
Copy link
Member

Xanewok commented Aug 24, 2018

I can take a look at the Windows error later today.

Xanewok added a commit to rust-lang/rls that referenced this pull request Aug 24, 2018
@Xanewok
Import json_internal
9cb3c3c 
Fixing error from rust-lang/rust#53610 (comment), specifically https://ci.appveyor.com/project/rust-lang/rust/build/1.0.8732/job/1vio56we88sawdcb#L11560.

Confirmed the error and the fix while using rust-lang/rust@61b0072.
@Xanewok Xanewok mentioned this pull request Aug 24, 2018
Closed
@Xanewok
Copy link
Member

Xanewok commented Aug 24, 2018

Verified the fix in rust-lang/rls#1013 locally, so when that lands we should update RLS to pull that instead.

@Xanewok Xanewok mentioned this pull request Aug 25, 2018
Merged
bors added a commit that referenced this pull request Aug 25, 2018
@bors
Auto merge of #53701 - Xanewok:update-rls, r=kennytm
39e6ba8 
Update RLS

Continuation of #53610.
Workspaces are tricky - the `json_internal` problem was only reproducible in Rust CI (not sure why it was only relevant to Windows?) and it seems that this was fixed by updating serde_json workspace-wide.

Tested locally in Rust repo and it seems to be working.

Nightlies are currently shipping without RLS, so it'd be great to include this in the next nightlies if possible.
@matthiaskrgr matthiaskrgr deleted the update_rls_submodule branch August 28, 2018 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @rust-highfive @alexcrichton @bors @nrc @kennytm @Xanewok