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

Update chrono/spdx-rs/time #110186

Merged
merged 1 commit into from
Apr 23, 2023
Merged

Update chrono/spdx-rs/time #110186

merged 1 commit into from
Apr 23, 2023

Conversation

Noratrieb
Copy link
Member

@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@klensy
Copy link
Contributor

klensy commented Apr 11, 2023

Should chrono be newer? v0.4.22 fixed regressions on some platforms, or maybe latest version.

@Noratrieb
Copy link
Member Author

You're totally right, I wanted the latest version. cargo update -p chrono didn't collaborate with that, but --precise 0.4.24 fixed it, although it's now complaining that a Apache-2.0 crate was added.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 11, 2023
@bors
Copy link
Contributor

bors commented Apr 16, 2023

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

@Mark-Simulacrum
Copy link
Member

r=me in general

@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 Apr 20, 2023
@Noratrieb
Copy link
Member Author

diff has changed slightly because time is entirely gone now after the cargo workspace migration

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 22, 2023

📌 Commit f77541a has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2023
@bors
Copy link
Contributor

bors commented Apr 23, 2023

⌛ Testing commit f77541a with merge 61de794...

@bors
Copy link
Contributor

bors commented Apr 23, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 61de794 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2023
@bors bors merged commit 61de794 into rust-lang:master Apr 23, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 23, 2023
@Noratrieb Noratrieb deleted the update-time branch April 23, 2023 06:59
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (61de794): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants