Skip to content

Commit 3e60295

Browse files
authored
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 0424c57 + f152d09 commit 3e60295

File tree

4 files changed

+318
-325
lines changed

4 files changed

+318
-325
lines changed

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.

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;

0 commit comments

Comments
 (0)