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

Fix displaying ETA output for download tracker, make it consistent & treat output as integers. #1832

Merged
merged 1 commit into from
May 11, 2019

Conversation

konstankinollc
Copy link
Contributor

Addresses #1831

@kinnison
Copy link
Contributor

kinnison commented May 5, 2019

I thought we'd already dealt with this, sigh. What types are involved here because really all of the days/hours/minutes/seconds should be integers.

@kinnison
Copy link
Contributor

kinnison commented May 7, 2019

@rbtcollins Could you take a look and ensure that your PRs would fix this too? Assuming so, let me know and we'll close this in favour of the more deep correction. If not, then if I merge this, could you update your PRs to match?

@bors
Copy link
Contributor

bors commented May 7, 2019

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

@rbtcollins
Copy link
Contributor

My PR didn't fix this sorry, I was fixing an orthogonal problem - this change is still needed; @konstankinollc could you please rebase your patch then @kinnison can merge it? Thanks!

@konstankinollc
Copy link
Contributor Author

Absolutely, will do in a bit.

@konstankinollc
Copy link
Contributor Author

@kinnison ready for your review

@konstankinollc konstankinollc changed the title Make seconds output consistent & treat as int. Make download ETA output consistent & treat as ints. May 7, 2019
@konstankinollc
Copy link
Contributor Author

It also addresses a bug in computing hours to download.

@konstankinollc
Copy link
Contributor Author

Can anyone please explain why the build is failing on CI?

Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

As noted, please don't update the package version in Cargo.toml and I've explained the CI failure for you

Cargo.toml Outdated Show resolved Hide resolved
src/cli/download_tracker.rs Outdated Show resolved Hide resolved
@konstankinollc konstankinollc force-pushed the master branch 2 times, most recently from 9c45e86 to 58408ea Compare May 8, 2019 20:44
Cargo.lock Outdated Show resolved Hide resolved
Cargo.toml Outdated Show resolved Hide resolved
Make download duration output consistent & treat as integers.
Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

LGTM now, if it passes CI then it can merge IMO

@konstankinollc konstankinollc changed the title Make download ETA output consistent & treat as ints. Fix displaying ETA output for download tracker, make it consistent & treat output as integers. May 9, 2019
@kinnison kinnison merged commit c67a740 into rust-lang:master May 11, 2019
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.

4 participants