Closed
Conversation
Comparison of paths and strings is expected to be possible and needed e.g. in tests. This change adds the impls os `PartialEq` between strings and paths, both owned and unsized, in both directions. ACP: rust-lang/libs-team#151
Migrate the standard library from using the external `cfg_if` crate to
using the now-built-in `cfg_select` macro.
This does not yet eliminate the dependency from
`library/std/Cargo.toml`, because while the standard library itself no
longer uses `cfg_if`, it also incorporates the `backtrace` crate, which
does.
Migration assisted by the following vim command (after selecting the
full `cfg_if!` invocation):
```
'<,'>s/\(cfg_if::\)\?cfg_if/cfg_select/ | '<,'>s/^\( *\)} else {/\1}\r\1_ => {/c | '<,'>s/^\( *\)} else if #\[cfg(\(.*\))\] /\1}\r\1\2 => /e | '<,'>s/if #\[cfg(\(.*\))\] {/\1 => {/e
```
This is imperfect, but substantially accelerated the process. This
prompts for confirmation on the `} else {` since that can also appear
inside one of the arms. This also requires manual intervention to handle
any multi-line conditions.
…` file if there is more than one
rustbot
added
A-testsuite
Member
Author
Collaborator
bors
added
S-waiting-on-bors
Member
Author
|
@bors try jobs=dist-loongarch64-musl |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
added a commit
that referenced
this pull request
Aug 18, 2025
Rollup of 18 pull requests try-job: dist-loongarch64-musl
Contributor
Collaborator
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
added
S-waiting-on-author
Member
|
closing due to conflict |
rustbot
removed
the
S-waiting-on-author
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
20 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.
Successful merges:
impl PartialEq<{str,String}> for {Path,PathBuf}#140956 (impl PartialEq<{str,String}> for {Path,PathBuf})ip_from#141744 (Stabilizeip_from)ascasts as unreachable #144804 (Don't warn on never to anyascasts as unreachable)tests/ui/issues/tests to other subdirectories undertests/ui/#144983 (Rehome 37tests/ui/issues/tests to other subdirectories undertests/ui/)rustdoc-jstester would not pick the rightsearch.jsfile if there is more than one #145359 (Fix bug whererustdoc-jstester would not pick the rightsearch.jsfile if there is more than one)unicode_data.rsmention message #145486 (Fixunicode_data.rsmention message)cfg_iftocfg_select#145489 (library: Migrate fromcfg_iftocfg_select)should_renderinPrintAttributederive #145493 (removeshould_renderinPrintAttributederive)ltooptions from most to least optimizing #145533 (Reorderltooptions from most to least optimizing)()inderive(From)output. #145550 (Avoid using()inderive(From)output.)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup