Rollup of 18 pull requests #145566

Zalathar · 2025-08-18T11:17:41Z

Successful merges:

impl PartialEq<{str,String}> for {Path,PathBuf} #140956 (impl PartialEq<{str,String}> for {Path,PathBuf})
Stabilize ip_from #141744 (Stabilize ip_from)
Don't warn on never to any as casts as unreachable #144804 (Don't warn on never to any as casts as unreachable)
Rehome 37 tests/ui/issues/ tests to other subdirectories under tests/ui/ #144983 (Rehome 37 tests/ui/issues/ tests to other subdirectories under tests/ui/)
run spellcheck as a tidy extra check in ci #145025 (run spellcheck as a tidy extra check in ci)
rework GAT borrowck limitation error #145041 (rework GAT borrowck limitation error)
take attr style into account in diagnostics #145243 (take attr style into account in diagnostics)
Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one #145359 (Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one)
Couple of codegen_fn_attrs improvements #145429 (Couple of codegen_fn_attrs improvements)
Do not strip binaries in bootstrap everytime if they are unchanged #145452 (Do not strip binaries in bootstrap everytime if they are unchanged)
Fix unicode_data.rs mention message #145486 (Fix unicode_data.rs mention message)
library: Migrate from cfg_if to cfg_select #145489 (library: Migrate from cfg_if to cfg_select)
remove should_render in PrintAttribute derive #145493 (remove should_render in PrintAttribute derive)
Port must_use to the new target checking #145500 (Port must_use to the new target checking)
Simplify span caches #145505 (Simplify span caches)
Rust build fails on OpenBSD after using file_lock feature #145511 (Rust build fails on OpenBSD after using file_lock feature)
Reorder lto options from most to least optimizing #145533 (Reorder lto options from most to least optimizing)
Avoid using () in derive(From) output. #145550 (Avoid using () in derive(From) output.)

r? @ghost
@rustbot modify labels: rollup

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

Zalathar · 2025-08-18T11:18:00Z

Subset of #145552.

@bors r+ rollup=never p=5

bors · 2025-08-18T11:18:03Z

📌 Commit 374a77f has been approved by Zalathar

It is now in the queue for this repository.

Zalathar · 2025-08-18T11:18:13Z

@bors try jobs=dist-loongarch64-musl

Rollup of 18 pull requests try-job: dist-loongarch64-musl

rust-bors · 2025-08-18T12:57:46Z

☀️ Try build successful (CI)
Build commit: d1991c5 (d1991c5bced5af41860d7be37d8f87333429ac5b, parent: 425a9c0a0e365c0b8c6cfd00c2ded83a73bed9a0)

bors · 2025-08-18T15:47:38Z

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-hqapzc4 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-hqapzc4 --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/ui/reachable/expr_cast.stderr
Removing tests/ui/issues/issue-9123.rs
Removing tests/ui/issues/issue-8401.rs
Removing tests/ui/issues/issue-8044.rs
Removing tests/ui/issues/issue-7899.rs
Removing tests/ui/issues/issue-77218/issue-77218-2.stderr
Removing tests/ui/issues/issue-77218/issue-77218-2.rs
Removing tests/ui/issues/issue-77218/issue-77218-2.fixed
Auto-merging compiler/rustc_passes/src/errors.rs
Auto-merging compiler/rustc_passes/src/check_attr.rs
CONFLICT (content): Merge conflict in compiler/rustc_passes/src/check_attr.rs
Auto-merging compiler/rustc_passes/messages.ftl
Auto-merging compiler/rustc_attr_parsing/src/context.rs
Automatic merge failed; fix conflicts and then commit the result.

jhpratt · 2025-08-18T21:39:10Z

closing due to conflict

Kixunil and others added 30 commits May 13, 2025 23:41

impl PartialEq<{str,String}> for {Path,PathBuf}

aab1563

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

Stabilize ip_from

964eb82

refactor unreachable/expr_cast.rs test

a067c6a

don't warn on explicit casts of never to any

d2e133d

avoid duplicate error string

4e2d420

also consider HR bounds

d62e857

rework add_placeholder_from_predicate_note

a95a2ac

add comment

5c716bd

it's not a borrow checker limitation :<

3ebf611

All weak lang items have an explicit link name and vice versa

4d62bf1

Combining no_mangle and rustc_std_internal_symbol is not allowed

f3ef465

Merge link_name and export_name

460519a

Remove unused feature gate

f94a0d0

Do not strip binaries in bootstrap everytime if they are unchanged

ef3bb6f

take attr style into account in attr diagnostics

70e26c1

Fix unicode_data.rs mention message

e906a59

remove should_render in PrintAttribute derive

3450975

run spellcheck as a tidy extra check in ci

e31fed0

Make tool-only suggestion to remove attributes on invalid targets

4de539b

Port must_use to the new target checking

83701e0

Update uitests

b9d3145

Simplify decode_span.

6c15339

Simplify span_data_to_lines_and_cols.

a843730

tidy now installs typos-cli as-needed via cargo

1cb4fd7

tidy: run typos check in src root, not current dir

6a51eef

tidy: add better error reporting for if typos can't be run

d73e6b4

typos: allow moreso

0d797d2

std: fix more typos

2050a3b

Fix bug where rustdoc-js tester would not pick the right `search.js…

80d3234

…` file if there is more than one

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 18, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 18, 2025

Auto merge of #145566 - Zalathar:rollup-hqapzc4, r=<try>

d1991c5

Rollup of 18 pull requests try-job: dist-loongarch64-musl

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 18, 2025

jhpratt closed this Aug 18, 2025

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 18, 2025

Zalathar deleted the rollup-hqapzc4 branch August 18, 2025 22:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 18 pull requests #145566

Rollup of 18 pull requests #145566

Uh oh!

Zalathar commented Aug 18, 2025 •

edited by rustbot

Loading

Uh oh!

Zalathar commented Aug 18, 2025

Uh oh!

bors commented Aug 18, 2025

Uh oh!

Zalathar commented Aug 18, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 18, 2025

Uh oh!

bors commented Aug 18, 2025

Uh oh!

jhpratt commented Aug 18, 2025

Uh oh!

Uh oh!

Rollup of 18 pull requests #145566

Rollup of 18 pull requests #145566

Uh oh!

Conversation

Zalathar commented Aug 18, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Aug 18, 2025

Uh oh!

bors commented Aug 18, 2025

Uh oh!

Zalathar commented Aug 18, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 18, 2025

Uh oh!

bors commented Aug 18, 2025

Uh oh!

jhpratt commented Aug 18, 2025

Uh oh!

Uh oh!

Zalathar commented Aug 18, 2025 •

edited by rustbot

Loading