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

[Conflict Fix] Partial Rust Enum Serialization/Deserialization Support #110

Merged
merged 14 commits into from
Apr 15, 2020

Conversation

calvinbrown085
Copy link
Contributor

@calvinbrown085 calvinbrown085 commented Mar 2, 2020

This fixes conflicts introduced here.
#60

All credit goes to @jdeschenes for implementing the original feature.

@calvinbrown085 calvinbrown085 changed the title ]Conflict Fix] Partial Rust Enum Serialization/Deserialization Support [Conflict Fix] Partial Rust Enum Serialization/Deserialization Support Mar 2, 2020
@calvinbrown085
Copy link
Contributor Author

I'm not exactly sure what went wrong with the build here..

@calvinbrown085
Copy link
Contributor Author

@poros Do you know what went wrong on the build? It looks like cargo check worked fine.

@poros
Copy link
Collaborator

poros commented Mar 3, 2020

I am not really sure what the first error is, perhaps something transient caused by travis? Anyways, I have re-started the build and it fails with compilation errors. Maybe you can try to run make test locally and see if your branch works on your machine?

@codehearts
Copy link
Contributor

It looks like you just forgot to use serde::Serialize; in the test module of de.rs, the other two things were deprecation warnings that shouldn't break the stable and nightly builds

Co-Authored-By: Katie <codehearts@users.noreply.github.com>
@calvinbrown085
Copy link
Contributor Author

@codehearts Thanks! I must have missed that when fixing merge conflicts

@codehearts
Copy link
Contributor

Ah, now it looks like cargo fmt needs to be run on the repo for the build to be happy

@calvinbrown085
Copy link
Contributor Author

@codehearts I will grab this later tonight :)

@poros
Copy link
Collaborator

poros commented Apr 11, 2020

@calvinbrown085 are you still interested in this PR? It was pretty close to land!

@calvinbrown085
Copy link
Contributor Author

@poros Yes! I will grab this.

@calvinbrown085
Copy link
Contributor Author

@poros Okay I ran cargo fmt lets see if this passes :)

@calvinbrown085
Copy link
Contributor Author

@poros Anything else here?

@poros
Copy link
Collaborator

poros commented Apr 15, 2020

Nothing else, thanks :)

@poros poros merged commit 1f8af33 into flavray:master Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants