Skip to content

chang 1 tries to 1 try #15328

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
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
epage
epage reviewed Mar 19, 2025
View reviewed changes
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

weihanglo
weihanglo approved these changes Apr 11, 2025
View reviewed changes
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 You'll need to update snapshots. See https://doc.crates.io/contrib/tests/writing.html?highlight=snapshot#ui-tests.

@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.

weihanglo
weihanglo reviewed Apr 27, 2025
View reviewed changes
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.

weihanglo
weihanglo approved these changes Apr 28, 2025
View reviewed changes
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
@weihanglo weihanglo mentioned this pull request May 9, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 10, 2025
@bors
Auto merge of rust-lang#140876 - weihanglo:update-cargo, r=weihanglo
c6faa1b 
Update cargo

25 commits in 7918c7eb59614c39f1c4e27e99d557720976bdd7..056f5f4f3c100cb36b5e9aed2d20b9ea70aae295
2025-04-27 09:44:23 +0000 to 2025-05-09 14:54:18 +0000
- Revert "doc: Mention `XDG_DATA_HOME`" (rust-lang/cargo#15512)
- docs: update version notice for deprecation removal (rust-lang/cargo#15511)
- doc: Update instructions on using native-completions (rust-lang/cargo#15480)
- feat(network): use Retry-After header for HTTP 429 responses (rust-lang/cargo#15463)
- CI: Require schema job to pass (rust-lang/cargo#15504)
- chore(config): migrate renovate config (rust-lang/cargo#15501)
- Make cargo script ignore workspaces (rust-lang/cargo#15496)
- fix(rustc): Don't panic on unknown bins (rust-lang/cargo#15497)
- test: Remove unused nightly requirements (rust-lang/cargo#15498)
- Add support for `-Zembed-metadata` (rust-lang/cargo#15378)
- Fix tracking issue template link (rust-lang/cargo#15494)
- Refactor artifact deps in FeatureResolver::deps (rust-lang/cargo#15492)
- Improved error message for versions prefixed with `v` (rust-lang/cargo#15484)
- chore: fix some typos in comment (rust-lang/cargo#15485)
- fix: default to all targets when using `--edition` and ` --edition-idioms` in cargo fix (rust-lang/cargo#15192)
- Update fingerprint footnote (rust-lang/cargo#15478)
- feat(add): suggest similarly named features (rust-lang/cargo#15438)
- In package-workspace, keep dev-dependencies if they have a version (rust-lang/cargo#15470)
- docs: fix a typo in DependencyUI (rust-lang/cargo#15472)
- fix grammar, and remove confusing example (rust-lang/cargo#15457)
- Added tracing spans for rustc invocations (rust-lang/cargo#15464)
- Trivial tweaks to 'target_short_hash' (rust-lang/cargo#15461)
- chore(deps): update msrv (3 versions) to v1.84 (rust-lang/cargo#15456)
- feat(add/install): check if given crate argument would be valid with inserted @ symbol (rust-lang/cargo#15441)
- chang 1 tries to 1 try (rust-lang/cargo#15328)

r? ghost
@rustbot rustbot added this to the 1.89.0 milestone May 10, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@epage epage epage left review comments

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

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
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.
4 participants
@zhw2101024 @rustbot @weihanglo @epage