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

Change type alias to struct #39

Merged
merged 5 commits into from
Apr 3, 2021
Merged

Change type alias to struct #39

merged 5 commits into from
Apr 3, 2021

Conversation

zakaluka
Copy link
Contributor

@zakaluka zakaluka commented Apr 2, 2021

No description provided.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 2, 2021

For #29

@MartinKavik
Copy link
Member

Hi @zakaluka and thanks for the PR.

Please make sure it's compilable, formatted and you should be able to remove some unnecessary Clippy attributes like #[allow(clippy::trivially_copy_pass_by_ref)].
Thanks!

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 2, 2021

I am not able to compile this - trying to figure out how to update the standback dependency because it fails to compile on 1.53 nightly. Will push any additional updates as required.

@MartinKavik
Copy link
Member

It should work mainly on stable Rust. Nightly isn't required.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 2, 2021

It looks like this is failing on Stable as well. Apparently standback had an issue where the wrong package (feature?) was being referenced: jhpratt/standback#11 . A new version has been released.

Should I try to use an older version of Rust to try and compile this?

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 2, 2021

Oddly enough ... when I build seed, it is using standback 0.2.15. However, I am not sure why the quickstart is trying to use 0.2.16

@MartinKavik
Copy link
Member

MartinKavik commented Apr 2, 2021

I see. However it looks like they've fixed our older dependency issues and it's compilable for me when I delete Cargo.lock. Please delete your Cargo.lock and push the new one if it works, thanks.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 2, 2021

Thanks @MartinKavik . Cargo.lock is fixed and a test from my fork was successful.

@MartinKavik
Copy link
Member

Remove please #[derive(Default)] from Model and replace Model::default with

Model {
    counter: 0
}

and we should be ready to go.
Reason: see Why don't implement Default and other standard traits block in https://seed-rs.org/0.8.0/model

@MartinKavik
Copy link
Member

Could you finish it and squash commits when you have time? I would like to merge it and resolve the dependency problem. Thanks!

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 3, 2021

Will do. I will update all 3 areas.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 3, 2021

I need to update the "Model" page on the guide. I will do that as part of this commit as well. Will let you know once I've tested it.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 3, 2021

@MartinKavik 4 items have been updated, all linked to #29 in 3 separate pull requests. 2 commit checks are still running (seed and seed-rs.org). Please let me know if you see any other issues.

@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 3, 2021

@MartinKavik also, in terms of squashing - I think you have that option when merging the PR. I tried to squash on seed but I'm not sure it did what you wanted.

@MartinKavik
Copy link
Member

@MartinKavik also, in terms of squashing - I think you have that option when merging the PR. I tried to squash on seed but I'm not sure it did what you wanted.

The result should be one force-pushed commit. It's basically a two-clicks operation if you use something like GitKraken. However I can live with a couple of "weird" commits, I don't want to torture you with too many "administrative tasks". Almost all my repos allow only rebasing.

All PRs now look good if I don't overlook something. I'll merge them once all pipelines pass. Thanks!

@MartinKavik MartinKavik merged commit 2d1a14d into seed-rs:master Apr 3, 2021
@zakaluka
Copy link
Contributor Author

zakaluka commented Apr 3, 2021

I will try GitKraken next time - thanks for the pointer

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.

2 participants