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

0.5 alpha compressed commits #794

Merged
merged 5 commits into from
Aug 29, 2022
Merged

0.5 alpha compressed commits #794

merged 5 commits into from
Aug 29, 2022

Conversation

esheppa
Copy link
Collaborator

@esheppa esheppa commented Aug 27, 2022

No description provided.

@esheppa esheppa mentioned this pull request Aug 27, 2022
src/lib.rs Outdated
#[cfg_attr(docsrs, doc(cfg(feature = "oldtime")))]
extern crate time as oldtime;
#[cfg(not(feature = "oldtime"))]
mod oldtime;
// this reexport is to aid the transition and should not be in the prelude!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should remove this line, too, right?

#[cfg_attr(docsrs, doc(cfg(feature = "oldtime")))]
extern crate time as oldtime;
#[cfg(not(feature = "oldtime"))]
mod oldtime;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this module declaration (and the import below, I suppose), I'm pretty sure this commit does not compile (and test). Would be nice to fix that properly.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yikes I must have grabbed this in the wrong commit

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm looks like I wiped out some commits when redoing them, will separate them again (I'm learning a bunch of git features I never knew existed!)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you did this using rebase -i, watch out for amending commits vs continuing the rebase, that's usually how I accidentally squash commits.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Classic, that is exactly what I did! Should be right now, I've checked that it can compile at each commit

@djc djc mentioned this pull request Aug 27, 2022
@esheppa esheppa force-pushed the 0.5-alpha-redo branch 4 times, most recently from 785fbb4 to dfc49f1 Compare August 27, 2022 13:22
Copy link
Member

@djc djc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Just needs a rebase.

esheppa and others added 5 commits August 28, 2022 15:46
Co-authored-by: Dirkjan Ochtman <[email protected]>
Co-authored-by: Dirkjan Ochtman <[email protected]>
Co-authored-by: Dirkjan Ochtman <[email protected]>
@djc djc merged commit c57fa03 into chronotope:main Aug 29, 2022
@djc
Copy link
Member

djc commented Aug 29, 2022

I've pushed a 0.4.x branch from the HEAD of main before merging this.

@esheppa esheppa deleted the 0.5-alpha-redo branch August 29, 2022 11:06
@pitdicker pitdicker mentioned this pull request May 16, 2023
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