Skip to content

Commit 437594f

Browse files
authored
Unrolled build for rust-lang#138387
Rollup merge of rust-lang#138387 - RalfJung:intrinsic-arg-names, r=oli-obk intrinsics: remove unnecessary leading underscore from argument names This is unnecessary since rust-lang#135840.
2 parents aaa2d47 + cf318a7 commit 437594f

34 files changed

+362
-369
lines changed

compiler/rustc_codegen_cranelift/example/mini_core.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -624,25 +624,25 @@ pub mod intrinsics {
624624
#[rustc_intrinsic]
625625
pub fn size_of<T>() -> usize;
626626
#[rustc_intrinsic]
627-
pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize;
627+
pub unsafe fn size_of_val<T: ?::Sized>(val: *const T) -> usize;
628628
#[rustc_intrinsic]
629629
pub fn min_align_of<T>() -> usize;
630630
#[rustc_intrinsic]
631-
pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize;
631+
pub unsafe fn min_align_of_val<T: ?::Sized>(val: *const T) -> usize;
632632
#[rustc_intrinsic]
633-
pub unsafe fn copy<T>(_src: *const T, _dst: *mut T, _count: usize);
633+
pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize);
634634
#[rustc_intrinsic]
635-
pub unsafe fn transmute<T, U>(_e: T) -> U;
635+
pub unsafe fn transmute<T, U>(e: T) -> U;
636636
#[rustc_intrinsic]
637-
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32;
637+
pub unsafe fn ctlz_nonzero<T>(x: T) -> u32;
638638
#[rustc_intrinsic]
639639
pub fn needs_drop<T: ?::Sized>() -> bool;
640640
#[rustc_intrinsic]
641-
pub fn bitreverse<T>(_x: T) -> T;
641+
pub fn bitreverse<T>(x: T) -> T;
642642
#[rustc_intrinsic]
643-
pub fn bswap<T>(_x: T) -> T;
643+
pub fn bswap<T>(x: T) -> T;
644644
#[rustc_intrinsic]
645-
pub unsafe fn write_bytes<T>(_dst: *mut T, _val: u8, _count: usize);
645+
pub unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
646646
#[rustc_intrinsic]
647647
pub unsafe fn unreachable() -> !;
648648
}

compiler/rustc_codegen_gcc/example/mini_core.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -595,25 +595,25 @@ pub mod intrinsics {
595595
#[rustc_intrinsic]
596596
pub fn size_of<T>() -> usize;
597597
#[rustc_intrinsic]
598-
pub unsafe fn size_of_val<T: ?::Sized>(_val: *const T) -> usize;
598+
pub unsafe fn size_of_val<T: ?::Sized>(val: *const T) -> usize;
599599
#[rustc_intrinsic]
600600
pub fn min_align_of<T>() -> usize;
601601
#[rustc_intrinsic]
602-
pub unsafe fn min_align_of_val<T: ?::Sized>(_val: *const T) -> usize;
602+
pub unsafe fn min_align_of_val<T: ?::Sized>(val: *const T) -> usize;
603603
#[rustc_intrinsic]
604-
pub unsafe fn copy<T>(_src: *const T, _dst: *mut T, _count: usize);
604+
pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize);
605605
#[rustc_intrinsic]
606-
pub unsafe fn transmute<T, U>(_e: T) -> U;
606+
pub unsafe fn transmute<T, U>(e: T) -> U;
607607
#[rustc_intrinsic]
608-
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32;
608+
pub unsafe fn ctlz_nonzero<T>(x: T) -> u32;
609609
#[rustc_intrinsic]
610610
pub fn needs_drop<T: ?::Sized>() -> bool;
611611
#[rustc_intrinsic]
612-
pub fn bitreverse<T>(_x: T) -> T;
612+
pub fn bitreverse<T>(x: T) -> T;
613613
#[rustc_intrinsic]
614-
pub fn bswap<T>(_x: T) -> T;
614+
pub fn bswap<T>(x: T) -> T;
615615
#[rustc_intrinsic]
616-
pub unsafe fn write_bytes<T>(_dst: *mut T, _val: u8, _count: usize);
616+
pub unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
617617
#[rustc_intrinsic]
618618
pub unsafe fn unreachable() -> !;
619619
}

library/alloc/src/boxed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub struct Box<
239239
/// This is the surface syntax for `box <expr>` expressions.
240240
#[rustc_intrinsic]
241241
#[unstable(feature = "liballoc_internals", issue = "none")]
242-
pub fn box_new<T>(_x: T) -> Box<T>;
242+
pub fn box_new<T>(x: T) -> Box<T>;
243243

244244
impl<T> Box<T> {
245245
/// Allocates memory on the heap and then places `x` into it.

library/core/src/ffi/va_list.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,15 @@ impl<'f> Drop for VaListImpl<'f> {
306306
/// `va_copy`.
307307
#[rustc_intrinsic]
308308
#[rustc_nounwind]
309-
unsafe fn va_end(_ap: &mut VaListImpl<'_>);
309+
unsafe fn va_end(ap: &mut VaListImpl<'_>);
310310

311311
/// Copies the current location of arglist `src` to the arglist `dst`.
312312
#[rustc_intrinsic]
313313
#[rustc_nounwind]
314-
unsafe fn va_copy<'f>(_dest: *mut VaListImpl<'f>, _src: &VaListImpl<'f>);
314+
unsafe fn va_copy<'f>(dest: *mut VaListImpl<'f>, src: &VaListImpl<'f>);
315315

316316
/// Loads an argument of type `T` from the `va_list` `ap` and increment the
317317
/// argument `ap` points to.
318318
#[rustc_intrinsic]
319319
#[rustc_nounwind]
320-
unsafe fn va_arg<T: sealed_trait::VaArgSafe>(_ap: &mut VaListImpl<'_>) -> T;
320+
unsafe fn va_arg<T: sealed_trait::VaArgSafe>(ap: &mut VaListImpl<'_>) -> T;

library/core/src/intrinsics/mod.rs

+246-253
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)