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

Expose FileLines JSON representation #2915

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Aug 14, 2018

Blocks rust-lang/rls#990.

r? @nrc

@nrc
Copy link
Member

nrc commented Aug 14, 2018

lgtm, but seems to be failing a test

@Xanewok
Copy link
Member Author

Xanewok commented Aug 14, 2018

Ah right, this will need some defined ordering. My bad, on it!

@Xanewok
Copy link
Member Author

Xanewok commented Aug 14, 2018

CI seems okay now, although it seems that unrelated(?) errors creeped in:
packed_simd:

   Compiling arrayvec v0.4.7
error: Could not compile `packed_simd`.

rand:

+[[ 1 != 0 ]]
+cat rustfmt_check_output
Diff in /home/travis/build/rust-lang-nursery/rustfmt/rand/src/rngs/entropy.rs at line 290:
         all(target_arch = "wasm32", feature = "stdweb"),
         all(target_arch = "wasm32", feature = "wasm-bindgen"),
     ),
-)))]
+),))]

@topecongiro
Copy link
Contributor

AFAICT the error is unrelated to this PR, possibly due to #2900 (unfortunately, rustfmt cannot remove the trailing comma because, in theory, that could change the semantic of the original code).

@Xanewok
Copy link
Member Author

Xanewok commented Aug 20, 2018

Is there anything else I can do to get this merged? Is the tree closed until CI is all green again?

@nrc nrc merged commit 127a480 into rust-lang:master Aug 21, 2018
@nrc
Copy link
Member

nrc commented Aug 21, 2018

Nah, I was just on planes, etc. Thanks for the PR!

@Xanewok Xanewok deleted the file-lines-ser-json branch August 21, 2018 13:42
@Xanewok
Copy link
Member Author

Xanewok commented Aug 21, 2018

Could we publish a new minor/patch with this? #2935 also bumped rustc-ap-* packages, so it might be good to include that, also.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants