Skip to content

Conversation

Xanewok
Copy link
Contributor

@Xanewok Xanewok commented Aug 25, 2018

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.

@rust-highfive
Copy link
Contributor

⚠️ 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 25, 2018
@kennytm
Copy link
Member

kennytm commented Aug 25, 2018

@bors r+ p=79

@bors
Copy link
Collaborator

bors commented Aug 25, 2018

📌 Commit 0741ed8a08eb7b3290522ff44842bab1dda38a92 has been approved by kennytm

@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 25, 2018
@bors
Copy link
Collaborator

bors commented Aug 25, 2018

⌛ Testing commit 0741ed8a08eb7b3290522ff44842bab1dda38a92 with merge 2d1d3ccb2d5a820db27cdb670ed6f1eff29b4729...

@bors
Copy link
Collaborator

bors commented Aug 25, 2018

💔 Test failed - status-travis

@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 25, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member

kennytm commented Aug 25, 2018

Please exempt ryu from tidy for now.

(cc serde-rs/json#474)

@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 25, 2018
This fixes 'cannot find macro `json_internal!` in this scope' RLS
compilation error in Rust CI, presumably due to a local macro fix in
serde_json 1.0.25
(serde-rs/json@e40cbad)
@Xanewok
Copy link
Contributor Author

Xanewok commented Aug 25, 2018

@kennytm done.

@kennytm
Copy link
Member

kennytm commented Aug 25, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 25, 2018

📌 Commit 3a17cf7 has been approved by kennytm

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

kennytm commented Aug 25, 2018

@bors delegate+

#53567, if merged, will conflict with this PR, and you'll need to rebase then.

@bors
Copy link
Collaborator

bors commented Aug 25, 2018

✌️ @Xanewok can now approve this pull request

@bors
Copy link
Collaborator

bors commented Aug 25, 2018

⌛ Testing commit 3a17cf7 with merge 39e6ba8...

bors added a commit that referenced this pull request Aug 25, 2018
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.
@bors
Copy link
Collaborator

bors commented Aug 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 39e6ba8 to master...

@bors bors merged commit 3a17cf7 into rust-lang:master Aug 25, 2018
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #53701!

Tested on commit 39e6ba8.
Direct link to PR: #53701

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 25, 2018
Tested on commit rust-lang/rust@39e6ba8.
Direct link to PR: <rust-lang/rust#53701>

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
@Xanewok Xanewok deleted the update-rls branch August 25, 2018 21:43
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.

4 participants