Skip to content

chang 1 tries to 1 try #15328

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

Merged
merged 1 commit into from
Apr 28, 2025
Merged

chang 1 tries to 1 try #15328

merged 1 commit into from
Apr 28, 2025

Conversation

zhw2101024
Copy link
Contributor

What does this PR try to resolve?

The "1 tries remaining" message is boring, "1 try remaining" seems better.

How should we test and review this PR?

Run cargo update without network and watch the output messages.

@rustbot
Copy link
Collaborator

rustbot commented Mar 19, 2025

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-networking Area: networking issues, curl, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2025
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

Thanks!

Looks like the tests need to be updated.

@weihanglo
Copy link
Member

@zhw2101024 mind rebasing this onto the latest master branch, so we can then merge it?

@zhw2101024
Copy link
Contributor Author

@zhw2101024 mind rebasing this onto the latest master branch, so we can then merge it?

Hi, rebasing finished. Thanks

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks. I rebased onto master to make CI pass.

@weihanglo weihanglo enabled auto-merge April 11, 2025 18:51
auto-merge was automatically disabled April 21, 2025 13:38

Head branch was pushed to by a user without write access

@weihanglo
Copy link
Member

@zhw2101024 zhw2101024 force-pushed the patch-1 branch 2 times, most recently from 96ac705 to e31bf5d Compare April 26, 2025 19:44
@zhw2101024
Copy link
Contributor Author

@zhw2101024 You'll need to update snapshots. See https://doc.crates.io/contrib/tests/writing.html?highlight=snapshot#ui-tests.

Would you please give some more hints? I read the page but can't find what to do next.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

It's a few lines down there.

The project, stdout, and stderr snapshots can be updated by running with the SNAPSHOTS=overwrite environment variable, like:

$ SNAPSHOTS=overwrite cargo test

But anyway looks like it is mostly done.

@zhw2101024
Copy link
Contributor Author

It's a few lines down there.

The project, stdout, and stderr snapshots can be updated by running with the SNAPSHOTS=overwrite environment variable, like:

$ SNAPSHOTS=overwrite cargo test

But anyway looks like it is mostly done.

I did SNAPSHOTS=overwrite cargo test and there's no modify to be commited.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks!

@weihanglo weihanglo added this pull request to the merge queue Apr 28, 2025
Merged via the queue into rust-lang:master with commit a98aec6 Apr 28, 2025
23 checks passed
@zhw2101024 zhw2101024 deleted the patch-1 branch April 28, 2025 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-networking Area: networking issues, curl, etc. 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.

4 participants