Skip to content

Move join_lines and test_utils to ra_ide_api #1012

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
Merged
merged 3 commits into from
Mar 22, 2019
Merged

Move join_lines and test_utils to ra_ide_api #1012

merged 3 commits into from
Mar 22, 2019

Conversation

detrumi
Copy link
Member

@detrumi detrumi commented Mar 21, 2019

Part of #1009

@detrumi
Copy link
Member Author

detrumi commented Mar 21, 2019 •
edited
Loading

@matklad It's currently not building because unrelated methods such as parse can't be found on the database, any pointers? (I guess it's because I don't understand salsa well enough)

Edit: huh, Travis is giving different errors. Maybe I just need to update something
Edit2: Weird, rustup update fixed it

@vipentti
Copy link
Contributor

The parse errors may be related to #826

@matklad
Copy link
Member

matklad commented Mar 22, 2019

Yeah, rm -rf target/{debug,release}/.incremental should fix this, it's a compiler bug.

@matklad
Copy link
Member

matklad commented Mar 22, 2019

LGTM, but looks like this does not build on travis? Filed #1018 to further improve edits creation.

@detrumi detrumi changed the title Move join_lines to ra_ide_api WIP: Move join_lines to ra_ide_api Mar 22, 2019
@detrumi
Copy link
Member Author

detrumi commented Mar 22, 2019

LGTM, but looks like this does not build on travis? Filed #1018 to further improve edits creation.

Yes, haven't gotten around to fixing the build yet :)
Good idea on the edits creation, it's kind of cumbersome currently.

@detrumi detrumi changed the title WIP: Move join_lines to ra_ide_api Move join_lines to ra_ide_api Mar 22, 2019
@detrumi detrumi changed the title Move join_lines to ra_ide_api Move join_lines and test_utils to ra_ide_api Mar 22, 2019
@detrumi
Copy link
Member Author

detrumi commented Mar 22, 2019

@matklad Fixed the build now. Note that this was also the last use of test_utils in ra_ide_api_light, so that was moved as well.

@matklad
Copy link
Member

matklad commented Mar 22, 2019

bors r+

Thanks!

bors bot added a commit that referenced this pull request Mar 22, 2019
@bors @detrumi
Merge #1012
3604f23 
1012: Move join_lines and test_utils to ra_ide_api r=matklad a=detrumi

Part of #1009 

Co-authored-by: Wilco Kusee <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 22, 2019

Build succeeded

@bors bors bot merged commit 01bca71 into rust-lang:master Mar 22, 2019
@detrumi detrumi deleted the move-join-lines branch March 22, 2019 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matklad matklad matklad left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@detrumi @vipentti @matklad