fix(tests): allow for 'could not' as well as couldn't in test output#16698
Merged
epage merged 1 commit intorust-lang:masterfrom Mar 4, 2026
Merged
fix(tests): allow for 'could not' as well as couldn't in test output#16698epage merged 1 commit intorust-lang:masterfrom
epage merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
r? @weihanglo rustbot has assigned @weihanglo. Use Why was this reviewer chosen?The reviewer was selected based on:
|
0xPoe
approved these changes
Mar 4, 2026
Member
There was a problem hiding this comment.
Thanks! 
The differences arise from libcurl:
For example:
- https://github.com/curl/curl/blob/3027611ca6d4cc5510d2d0fccc3e5a074e09a2fb/lib/file.c#L244
- https://github.com/curl/curl/blob/master/lib/file.c#L240
Do we need to add a comment to explain why?
Contributor
|
We already redact similarly, I'm fine with merging and improving over time. |
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Mar 5, 2026
Update cargo submodule 11 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..708100e0d0fe64ad66e05dc5a19110936a5ca4b1 2026-02-24 21:59:20 +0000 to 2026-03-05 02:03:19 +0000 - Docs: Clarify build script current directory (rust-lang/cargo#16703) - test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700) - chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699) - fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698) - chore: Upgrade dependencies (rust-lang/cargo#16690) - chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685) - feat(help): display manpage for nested commands (rust-lang/cargo#16432) - feat: improve parent workspace search error msg (rust-lang/cargo#16669) - feat(fix): Inject an edition into scripts (rust-lang/cargo#16678) - fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676) - fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Mar 5, 2026
Update cargo submodule 12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799 2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000 - test(git): Mark a test as non-deterministic (rust-lang/cargo#16706) - Docs: Clarify build script current directory (rust-lang/cargo#16703) - test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700) - chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699) - fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698) - chore: Upgrade dependencies (rust-lang/cargo#16690) - chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685) - feat(help): display manpage for nested commands (rust-lang/cargo#16432) - feat: improve parent workspace search error msg (rust-lang/cargo#16669) - feat(fix): Inject an edition into scripts (rust-lang/cargo#16678) - fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676) - fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Mar 5, 2026
Update cargo submodule 12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799 2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000 - test(git): Mark a test as non-deterministic (rust-lang/cargo#16706) - Docs: Clarify build script current directory (rust-lang/cargo#16703) - test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700) - chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699) - fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698) - chore: Upgrade dependencies (rust-lang/cargo#16690) - chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685) - feat(help): display manpage for nested commands (rust-lang/cargo#16432) - feat: improve parent workspace search error msg (rust-lang/cargo#16669) - feat(fix): Inject an edition into scripts (rust-lang/cargo#16678) - fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676) - fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Mar 6, 2026
Update cargo submodule 12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799 2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000 - test(git): Mark a test as non-deterministic (rust-lang/cargo#16706) - Docs: Clarify build script current directory (rust-lang/cargo#16703) - test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700) - chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699) - fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698) - chore: Upgrade dependencies (rust-lang/cargo#16690) - chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685) - feat(help): display manpage for nested commands (rust-lang/cargo#16432) - feat: improve parent workspace search error msg (rust-lang/cargo#16669) - feat(fix): Inject an edition into scripts (rust-lang/cargo#16678) - fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676) - fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The error message on my system is
Could not, rather thanCouldn'twhich causes these tests to fail. The first occurrence is handled with[..], but the 2nd is not.