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

transpile: remove git-testament dependency (for now) to remove time dependency to build on 1.80.0 #1115

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

kkysen
Copy link
Contributor

@kkysen kkysen commented Aug 28, 2024

Our old nightly (1.65) pins time-macros to an old version, which requires time to stay on an old version. But since 1.80 broke time (due to time-rs/time#693 and rust-lang/rust#127343), we need to update time. Doing this requires time-macros to be upgraded, which requires at least rust 1.67. There's an old PR, #811, for this, but it needs rebasing. So for now, removing git-testament and its time dependency is simpler, and we can add it back later once we update to a newer nightly.

With this fix, both cargo build -p c2rust (the pinned nightly) and cargo +stable build -p c2rust (1.80.1) now work.

If this is good, and once we merge this, we'll release a new version with the fix.

…e` dependency to build on 1.80.0

Our old nightly (1.65) pins `time-macros` to an old version, which requires `time` to stay on an old version.
But since 1.80 broke `time` (due to time-rs/time#693 and rust-lang/rust#127343),
we need to update `time`.  Doing this requires `time-macros` to be upgraded, which requires at least rust 1.67.
There's an old PR, #811, for this, but it needs rebasing.
So for now, removing `git-testament` and its `time` dependency is simpler,
and we can add it back later once we update to a newer nightly.
@kkysen
Copy link
Contributor Author

kkysen commented Aug 28, 2024

@chrysn, feel free to review and/or test this. Hopefully it works for everything you need.

Copy link
Contributor

@fw-immunant fw-immunant left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for untangling these dep issues.

@kkysen kkysen merged commit df3893f into master Aug 28, 2024
9 checks passed
@kkysen kkysen deleted the kkysen/remove-git-testament branch August 28, 2024 17:25
dgherzka pushed a commit to dgherzka/c2rust that referenced this pull request Sep 4, 2024
…e` dependency to build on 1.80.0 (immunant#1115)

* Fixes immunant#1109.

Our old nightly (1.65) pins `time-macros` to an old version, which
requires `time` to stay on an old version. But since 1.80 broke `time`
(due to time-rs/time#693 and
rust-lang/rust#127343), we need to update
`time`. Doing this requires `time-macros` to be upgraded, which requires
at least rust 1.67. There's an old PR, immunant#811, for this, but it needs
rebasing. So for now, removing `git-testament` and its `time` dependency
is simpler, and we can add it back later once we update to a newer
nightly.

With this fix, both `cargo build -p c2rust` (the pinned nightly) and
`cargo +stable build -p c2rust` (1.80.1) now work.

If this is good, and once we merge this, we'll release a new version
with the fix.
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.

rust 1.80.0 build issue Fails to compile on latest nightly
3 participants