Rollup of 8 pull requests #131624

matthiaskrgr · 2024-10-12T20:05:46Z

Successful merges:

Check ABI target compatibility for function pointers #128784 (Check ABI target compatibility for function pointers)
make Step doc-comments more clear #130965 (make Step doc-comments more clear)
Don't assume traits used as type are trait objs in 2021 edition #131239 (Don't assume traits used as type are trait objs in 2021 edition)
Handle clippy cases of rustc::potential_query_instability lint #131277 (Handle clippy cases of rustc::potential_query_instability lint)
More clearly document Stdin::read_line #131503 (More clearly document Stdin::read_line)
Emit an error for unstable attributes that reference already stable features #131567 (Emit an error for unstable attributes that reference already stable features)
merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate #131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
remove const_cow_is_borrowed feature gate #131617 (remove const_cow_is_borrowed feature gate)

r? @ghost
@rustbot modify labels: rollup

This check was previously only performed on functions not function pointers. Co-authored-by: Folkert <[email protected]>

Signed-off-by: onur-ozkan <[email protected]>

These are common pitfalls for beginners, so I think it's worth making the subtleties more visible.

…eatures Add missing error annotations and .stderr file Acknowledge comments

…iler-errors Check ABI target compatibility for function pointers Tracking issue: rust-lang#130260 Related tracking issue: rust-lang#87678 Compatibility of an ABI for a target was previously only performed on function definitions and `extern` blocks. This PR adds it also to function pointers to be consistent. This might have broken some of the `tests/ui/` depending on the platform, so a try run seems like a good idea. Also this might break existing code, because we now emit extra errors. Does this require a crater run? # Example ```rust // build with: --target=x86_64-unknown-linux-gnu // These raise E0570 extern "thiscall" fn foo() {} extern "thiscall" { fn bar() } // This did not raise any error fn baz(f: extern "thiscall" fn()) { f() } ``` # Open Questions * [x] Should this report a future incompatibility warning like rust-lang#87678 ? * [ ] Is this the best place to perform the check?

…c, r=Mark-Simulacrum make `Step` doc-comments more clear Aiming to improve complicated `Step` documentation. Once we merge this, I will update [this page](https://rustc-dev-guide.rust-lang.org/building/bootstrapping/how-bootstrap-does-it.html?highlight=Step#synopsis-of--step) too.

…lcnr Don't assume traits used as type are trait objs in 2021 edition Fixes rust-lang#127548 When you use a trait as a type, the compiler automatically assumes you meant to use a trait object, which is not always the case. This PR fixes the bug where you don't need a trait object, so the error message was changed to: ``` error[E0782]: expected a type, found a trait ``` Also fixes some ICEs: Fixes rust-lang#120241 Fixes rust-lang#120482 Fixes rust-lang#125512

…y-instability-lint-for-clippy, r=xFrednet Handle `clippy` cases of `rustc::potential_query_instability` lint This PR removes `#![allow(rustc::potential_query_instability)]` line from [`src/tools/clippy/clippy_lints/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/src/tools/clippy/clippy_lints/src/lib.rs#L30) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors. A somewhat tracking issue: rust-lang#84447

…=Mark-Simulacrum More clearly document Stdin::read_line These are common pitfalls for beginners, so I think it's worth making the subtleties more visible.

…ccepted-features, r=jieyouxu Emit an error for unstable attributes that reference already stable features Closes rust-lang#129814

merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate rust-lang#76205 has been closed a while ago, but there are still some functions that reference it. Those functions are all unstable *and* const-unstable. There's no good reason to use a separate feature gate for their const-stability, so this PR moves their const-stability under the same gate as their regular stability, and therefore removes the remaining references to rust-lang#76205.

…tgross35 remove const_cow_is_borrowed feature gate The two functions guarded by this are still unstable, and there's no reason to require a separate feature gate for their const-ness -- we can just have `cow_is_borrowed` cover both kinds of stability. Cc rust-lang#65143

matthiaskrgr · 2024-10-12T20:06:11Z

@bors r+ rollup=never p=8

bors · 2024-10-12T20:06:13Z

📌 Commit 1787b68 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-12T20:59:30Z

🔒 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-sq1awa8 (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-sq1awa8 --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/crashes/125512.rs
Removing tests/crashes/120482.rs
Removing tests/crashes/120241.rs
Removing tests/crashes/120241-2.rs
Auto-merging library/core/tests/lib.rs
Auto-merging library/core/src/lib.rs
CONFLICT (content): Merge conflict in library/core/src/lib.rs
Auto-merging library/alloc/tests/lib.rs
Auto-merging library/alloc/src/lib.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-10-12T22:03:18Z

☔ The latest upstream changes (presumably #131612) made this pull request unmergeable. Please resolve the merge conflicts.

tdittr and others added 17 commits September 23, 2024 14:04

Check ABI target compatibility for function pointers

47293c1

This check was previously only performed on functions not function pointers. Co-authored-by: Folkert <[email protected]>

Also cover the new extern "C-cmse-nonsecure-entry" in tests

867e776

make Step doc-comments more clear

8ef0ba2

Signed-off-by: onur-ozkan <[email protected]>

Handle clippy cases of rustc::potential_query_instability lint

925e7e6

More clearly document Stdin::read_line

2035737

These are common pitfalls for beginners, so I think it's worth making the subtleties more visible.

Don't assume traits used as type are trait objs

9a2772e

Emit an error for unstable attributes that reference already stable f…

497100a

…eatures Add missing error annotations and .stderr file Acknowledge comments

merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate

043928a

remove const_cow_is_borrowed feature gate

a0661ec

Rollup merge of rust-lang#131503 - theemathas:stdin_read_line_docs, r…

df9ba78

…=Mark-Simulacrum More clearly document Stdin::read_line These are common pitfalls for beginners, so I think it's worth making the subtleties more visible.

Rollup merge of rust-lang#131567 - CastilloDel:reject-unstable-with-a…

79d8116

…ccepted-features, r=jieyouxu Emit an error for unstable attributes that reference already stable features Closes rust-lang#129814

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 Oct 12, 2024

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 Oct 12, 2024

matthiaskrgr closed this Oct 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #131624

Rollup of 8 pull requests #131624

matthiaskrgr commented Oct 12, 2024

matthiaskrgr commented Oct 12, 2024

bors commented Oct 12, 2024

bors commented Oct 12, 2024

bors commented Oct 12, 2024

Rollup of 8 pull requests #131624

Rollup of 8 pull requests #131624

Conversation

matthiaskrgr commented Oct 12, 2024

matthiaskrgr commented Oct 12, 2024

bors commented Oct 12, 2024

bors commented Oct 12, 2024

bors commented Oct 12, 2024