Rollup of 8 pull requests #131680

matthiaskrgr · 2024-10-14T11:30:43Z

Successful merges:

Stabilize Pin::as_deref_mut() #129424 (Stabilize Pin::as_deref_mut())
Fix clobber_abi and disallow SVE-related registers in Arm64EC inline assembly #131332 (Fix clobber_abi and disallow SVE-related registers in Arm64EC inline assembly)
Update precondition tests (especially for zero-size access to null) #131384 (Update precondition tests (especially for zero-size access to null))
Special treatment empty tuple when suggest adding a string literal in format macro. #131430 (Special treatment empty tuple when suggest adding a string literal in format macro.)
Stabilise const_make_ascii. #131496 (Stabilise const_make_ascii.)
Make some tweaks to extern block diagnostics #131550 (Make some tweaks to extern block diagnostics)
Fix AArch64InlineAsmReg::emit #131667 (Fix AArch64InlineAsmReg::emit)
compiletest: Document various parts of compiletest's lib.rs #131679 (compiletest: Document various parts of compiletest's lib.rs)

r? @ghost
@rustbot modify labels: rollup

…assembly

… format macro. For example: ```rust let s = "123"; println!({}, "sss", s); ``` Suggest: `println!("{:?} {} {}", {}, "sss", s);` fixes rust-lang#130170

…f_mut, r=dtolnay Stabilize `Pin::as_deref_mut()` Tracking issue: closes rust-lang#86918 Stabilizing the following API: ```rust impl<Ptr: DerefMut> Pin<Ptr> { pub fn as_deref_mut(self: Pin<&mut Pin<Ptr>>) -> Pin<&mut Ptr::Target>; } ``` I know that an FCP has not been started yet, but this isn't a very complex stabilization, and I'm hoping this can motivate an FCP to *get* started - this has been pending for a while and it's a very useful function when writing Future impls. r? `@jonhoo`

…nieu Fix clobber_abi and disallow SVE-related registers in Arm64EC inline assembly Currently `clobber_abi` in Arm64EC inline assembly is implemented using `InlineAsmClobberAbi::AArch64NoX18`, but broken since it attempts to clobber registers that cannot be used in Arm64EC: https://godbolt.org/z/r3PTrGz5r ``` error: cannot use register `x13`: x13, x14, x23, x24, x28, v16-v31 cannot be used for Arm64EC --> <source>:6:14 | 6 | asm!("", clobber_abi("C"), options(nostack, nomem, preserves_flags)); | ^^^^^^^^^^^^^^^^ error: cannot use register `x14`: x13, x14, x23, x24, x28, v16-v31 cannot be used for Arm64EC --> <source>:6:14 | 6 | asm!("", clobber_abi("C"), options(nostack, nomem, preserves_flags)); | ^^^^^^^^^^^^^^^^ <omitted the same errors for v16-v31> ``` Additionally, this disallows SVE-related registers per rust-lang#131332 (comment). cc `@dpaoliello` r? `@Amanieu` `@rustbot` label O-windows O-AArch64 +A-inline-assembly

…aheemdev Update precondition tests (especially for zero-size access to null) I don't much like the current way I've updated the precondition check helpers, but I couldn't come up with anything better. Ideas welcome. I've organized `tests/ui/precondition-checks` mostly with one file per function that has `assert_unsafe_precondition` in it, with revisions that check each precondition. The important new test is `tests/ui/precondition-checks/zero-size-null.rs`.

Special treatment empty tuple when suggest adding a string literal in format macro. For example: ```rust let s = "123"; println!({}, "sss", s); ``` Suggest: `println!("{:?} {} {}", {}, "sss", s);` fixes rust-lang#130170

…lnay Stabilise `const_make_ascii`. Closes: rust-lang#130698 This PR stabilises the `const_make_ascii` feature gate (i.e. marking the `make_ascii_uppercase` and `make_ascii_lowercase` methods in `char`, `u8`, `[u8]`, and `str` as const).

…astorino Make some tweaks to extern block diagnostics Self-explanatory. See the diagnostic changes; I hope they make them a bit more descriptive. r? spastorino

…t, r=Amanieu Fix AArch64InlineAsmReg::emit Currently, this method uses `self as u32 - Self::x0 as u32` to get register index: https://github.com/rust-lang/rust/blob/36780360b62320a61e2234b17ec600e8e4785509/compiler/rustc_target/src/asm/aarch64.rs#L204 However, this is incorrect for reasons explained in the following comment: https://github.com/rust-lang/rust/blob/36780360b62320a61e2234b17ec600e8e4785509/compiler/rustc_codegen_llvm/src/asm.rs#L544-L549 r? `@Amanieu` `@rustbot` label O-AArch64 +A-inline-assembly

compiletest: Document various parts of compiletest's `lib.rs` This adds some much-needed comments to many of the items in compiletest's `lib.rs`, giving a better overview of how a compiletest invocation actually proceeds. To make review easier I have refrained from renames or functional changes, though I couldn't resist getting rid of one obviously-redundant `Arc::clone` in `make_test_closure`.

matthiaskrgr · 2024-10-14T11:30:54Z

@bors r+ rollup=never p=8

bors · 2024-10-14T11:30:57Z

📌 Commit a0b6d49 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-14T15:02:27Z

🔒 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-krrzknp (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-krrzknp --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/precondition-checks/out-of-bounds-get-unchecked.rs
Removing tests/ui/precondition-checks/null-slice.rs
Removing tests/ui/precondition-checks/misaligned-slice.rs
Auto-merging library/core/src/lib.rs
CONFLICT (content): Merge conflict in library/core/src/lib.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-10-14T16:05:10Z

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

coolreader18 and others added 20 commits October 8, 2024 15:00

Stabilize Pin::as_deref_mut

5db54be

Allow zero-size reads/writes on null pointers

0c41c34

Add more precondition check tests

84dacc1

Clean up is_aligned_and_not_null

aec09a4

Add a test for zero-sized writes through null

a3606d7

Stabilise 'const_make_ascii';

028c859

Remove unadorned

c085071

Note what qualifier

d6391d5

Fix clobber_abi and disallow SVE-related registers in Arm64EC inline …

d858dfe

…assembly

Fix AArch64InlineAsmReg::emit

67ebb6c

Special treatment empty tuple when suggest adding a string literal in…

ceced53

… format macro. For example: ```rust let s = "123"; println!({}, "sss", s); ``` Suggest: `println!("{:?} {} {}", {}, "sss", s);` fixes rust-lang#130170

Document various parts of compiletest's lib.rs

cec5986

Rollup merge of rust-lang#131430 - surechen:fix_130495, r=jieyouxu

efe174a

Special treatment empty tuple when suggest adding a string literal in format macro. For example: ```rust let s = "123"; println!({}, "sss", s); ``` Suggest: `println!("{:?} {} {}", {}, "sss", s);` fixes rust-lang#130170

Rollup merge of rust-lang#131550 - compiler-errors:extern-diags, r=sp…

88f91ac

…astorino Make some tweaks to extern block diagnostics Self-explanatory. See the diagnostic changes; I hope they make them a bit more descriptive. r? spastorino

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 14, 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 14, 2024

matthiaskrgr closed this Oct 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #131680

Rollup of 8 pull requests #131680

matthiaskrgr commented Oct 14, 2024

matthiaskrgr commented Oct 14, 2024

bors commented Oct 14, 2024

bors commented Oct 14, 2024

bors commented Oct 14, 2024

Rollup of 8 pull requests #131680

Rollup of 8 pull requests #131680

Conversation

matthiaskrgr commented Oct 14, 2024

matthiaskrgr commented Oct 14, 2024

bors commented Oct 14, 2024

bors commented Oct 14, 2024

bors commented Oct 14, 2024