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

bootstrap: update some deps #92480

Closed
wants to merge 1 commit into from
Closed

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jan 1, 2022

update time 0.1 -> 0.3 to mitigate RUSTSEC-2020-0071 (partial changelog: https://github.com/time-rs/time/blob/592ef915cf6275069f65483216ba7ccb8081b2bc/CHANGELOG.md )
Crate time will be duplicated until other crates will be updated (not all of them released patched versions)

update pretty_assertions 0.6 -> 0.7 to drop ansi_term 0.11 dependency (changelog: https://github.com/colin-kiegel/rust-pretty-assertions/blob/da3cf9ad7a0a1120105efcd607b2b8c2bda37213/CHANGELOG.md)

update serde_json 1.0.59 -> 1.0.78 to dedupe itoa (it was added in time update). There no separate changelog for serde_json.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 1, 2022
Cargo.lock Outdated Show resolved Hide resolved
.unwrap_or_else(|_| time::now());
.unwrap_or_else(|_| OffsetDateTime::now_utc());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

What did the previous function do? Let's try to match that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looking at description at 0.1.x version, it says Returns the current time in the local timezone, so i guess it is.
From 0.3.6 (https://github.com/time-rs/time/blob/main/CHANGELOG.md#036-2022-01-20) now_local can be used again on more platforms.

@bors
Copy link
Contributor

bors commented Jan 2, 2022

☔ The latest upstream changes (presumably #92482) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2022
@Mark-Simulacrum
Copy link
Member

Marking as waiting on author per #92480 (comment) -- would like to see a response there.

It's worth noting that I suspect we could just drop the time crate dependency by dropping and/or hardcoding dates in man pages, which are likely not terribly important -- and seem to be the only use?

@joelpalmer joelpalmer added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 1, 2022
pretty_assertions 0.6 -> 0.7 to drop ansi_term 0.11 dependency
update serde_json to dedupe itoa duplicate (from time update)
@klensy
Copy link
Contributor Author

klensy commented Feb 4, 2022

@rustbot ready

Perhaps shouldn't be rolled up: may fail on some platforms (i hope this was fixed) plus serde_json may change perf?

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 2022
@Mark-Simulacrum
Copy link
Member

I've filed #93685 to drop the time crate dependency entirely -- that should simplify this PR, and I'd like to wait on that as I'm not so enthusiastic about the num-threads library being pulled in.

@klensy
Copy link
Contributor Author

klensy commented Feb 6, 2022

num_threads can possibly be dropped by using other method, because we need actually only year and month, i'll update pr.

@klensy
Copy link
Contributor Author

klensy commented Feb 6, 2022

Given that #93685 will be merged, i'll close this one and open other one, as there some things that can be cared about, and not bootstrap specific.

@klensy klensy closed this Feb 6, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 6, 2022
…albini

Drop time dependency from bootstrap

This was only used for the inclusion of 'current' dates into our manpages, but
it is not clear that this is practically necessary. The manpage is essentially
never updated, and so we can likely afford to keep a manual date in these files.
It also seems possible to just omit it, but that may cause other tools trouble,
so avoid doing that for now.

This is largely done to reduce bootstrap complexity; the time crate is not particularly
small and in rust-lang#92480 would have started pulling in num-threads, which does runtime
thread count detection. I would prefer to avoid that, so filing this to just drop the nearly
unused dependency entirely.

r? `@pietroalbini`
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 7, 2022
…albini

Drop time dependency from bootstrap

This was only used for the inclusion of 'current' dates into our manpages, but
it is not clear that this is practically necessary. The manpage is essentially
never updated, and so we can likely afford to keep a manual date in these files.
It also seems possible to just omit it, but that may cause other tools trouble,
so avoid doing that for now.

This is largely done to reduce bootstrap complexity; the time crate is not particularly
small and in rust-lang#92480 would have started pulling in num-threads, which does runtime
thread count detection. I would prefer to avoid that, so filing this to just drop the nearly
unused dependency entirely.

r? `@pietroalbini`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 13, 2022
…ulacrum

Drop time dependency from bootstrap

This was only used for the inclusion of 'current' dates into our manpages, but
it is not clear that this is practically necessary. The manpage is essentially
never updated, and so we can likely afford to keep a manual date in these files.
It also seems possible to just omit it, but that may cause other tools trouble,
so avoid doing that for now.

This is largely done to reduce bootstrap complexity; the time crate is not particularly
small and in rust-lang#92480 would have started pulling in num-threads, which does runtime
thread count detection. I would prefer to avoid that, so filing this to just drop the nearly
unused dependency entirely.

r? `@pietroalbini`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants