Skip to content

Commit 3f4f55a

Browse files
committed
Auto merge of #148817 - Zalathar:rollup-tf5ti2m, r=Zalathar
Rollup of 15 pull requests Successful merges: - rust-lang/rust#141470 (Add new `function_casts_as_integer` lint) - rust-lang/rust#143619 (`c_variadic`: Add future-incompatibility warning for `...` arguments without a pattern outside of `extern` blocks) - rust-lang/rust#146495 (rustdoc: Erase `#![doc(document_private_items)]`) - rust-lang/rust#147771 (Rename `*exact_{div,shr,shl}` to `*{div,shr,shl}_exact`) - rust-lang/rust#147833 (rustdoc-json: move `target` to `json::conversions`) - rust-lang/rust#147955 (compiletest: Migrate `TestProps` directive handling to a system of named handlers) - rust-lang/rust#148480 (Add `Steal::risky_hack_borrow_mut`) - rust-lang/rust#148506 (Special case detecting `'static` lifetime requirement coming from `-> Box<dyn Trait>`) - rust-lang/rust#148508 (Provide more context when mutably borrowing an imutably borrowed value) - rust-lang/rust#148530 (update the bootstrap readme) - rust-lang/rust#148608 (Add test for --test-builder success path) - rust-lang/rust#148636 (bootstrap: respect `build.python` on macOS) - rust-lang/rust#148639 (test(rustdoc): move tests into jump-to-def) - rust-lang/rust#148647 (Check unsafety for non-macro attributes in `validate_attr`) - rust-lang/rust#148667 (a few small clippy fixes) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 92ed621 + af85678 commit 3f4f55a

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/shims/native_lib/trace/parent.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,8 @@ fn handle_segfault(
500500
capstone_disassemble(&instr, addr, cs, acc_events).expect("Failed to disassemble instruction");
501501

502502
// Move the instr ptr into the deprotection code.
503-
#[expect(clippy::as_conversions)]
503+
#[allow(unknown_lints)]
504+
#[expect(clippy::as_conversions, function_casts_as_integer)]
504505
new_regs.set_ip(mempr_off as usize);
505506
// Don't mess up the stack by accident!
506507
new_regs.set_sp(stack_ptr);
@@ -552,7 +553,8 @@ fn handle_segfault(
552553
new_regs = regs_bak;
553554

554555
// Reprotect everything and continue.
555-
#[expect(clippy::as_conversions)]
556+
#[allow(unknown_lints)]
557+
#[expect(clippy::as_conversions, function_casts_as_integer)]
556558
new_regs.set_ip(mempr_on as usize);
557559
new_regs.set_sp(stack_ptr);
558560
ptrace::setregs(pid, new_regs).unwrap();

tests/pass/backtrace/backtrace-api-v1.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//@normalize-stderr-test: "::<.*>" -> ""
22

3+
#![allow(function_casts_as_integer)]
4+
35
#[inline(never)]
46
fn func_a() -> Box<[*mut ()]> {
57
func_b::<u8>()
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/pass/backtrace/backtrace-api-v1.rs:27:9 (func_d)
2-
tests/pass/backtrace/backtrace-api-v1.rs:14:9 (func_c)
3-
tests/pass/backtrace/backtrace-api-v1.rs:9:5 (func_b::<u8>)
4-
tests/pass/backtrace/backtrace-api-v1.rs:5:5 (func_a)
5-
tests/pass/backtrace/backtrace-api-v1.rs:34:18 (main)
1+
tests/pass/backtrace/backtrace-api-v1.rs:29:9 (func_d)
2+
tests/pass/backtrace/backtrace-api-v1.rs:16:9 (func_c)
3+
tests/pass/backtrace/backtrace-api-v1.rs:11:5 (func_b::<u8>)
4+
tests/pass/backtrace/backtrace-api-v1.rs:7:5 (func_a)
5+
tests/pass/backtrace/backtrace-api-v1.rs:36:18 (main)

0 commit comments

Comments
 (0)