Skip to content

Commit 3437315

Browse files
committed
Auto merge of #138414 - matthiaskrgr:rollup-9ablqdb, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #137314 (change definitely unproductive cycles to error) - #137701 (Convert `ShardedHashMap` to use `hashbrown::HashTable`) - #138269 (uefi: fs: Implement FileType, FilePermissions and FileAttr) - #138331 (Use `RUSTC_LINT_FLAGS` more) - #138345 (Some autodiff cleanups) - #138387 (intrinsics: remove unnecessary leading underscore from argument names) - #138390 (fix incorrect tracing log) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1197610 + bc049a1 commit 3437315

28 files changed

+28
-28
lines changed

tests/fail/intrinsics/copy_overlapping.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn copy_nonoverlapping<T>(_src: *const T, _dst: *mut T, _count: usize);
5+
unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
66

77
fn main() {
88
let mut data = [0u8; 16];

tests/fail/intrinsics/copy_unaligned.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn copy_nonoverlapping<T>(_src: *const T, _dst: *mut T, _count: usize);
5+
unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
66

77
fn main() {
88
let mut data = [0u16; 8];

tests/fail/intrinsics/ctlz_nonzero.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod rusti {
44
#[rustc_intrinsic]
5-
pub unsafe fn ctlz_nonzero<T>(_x: T) -> u32;
5+
pub unsafe fn ctlz_nonzero<T>(x: T) -> u32;
66
}
77

88
pub fn main() {

tests/fail/intrinsics/cttz_nonzero.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod rusti {
44
#[rustc_intrinsic]
5-
pub unsafe fn cttz_nonzero<T>(_x: T) -> u32;
5+
pub unsafe fn cttz_nonzero<T>(x: T) -> u32;
66
}
77

88
pub fn main() {

tests/fail/intrinsics/float_to_int_32_inf1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_infneg1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_nan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_nanneg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_neg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_too_big1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_too_big2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_32_too_small1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_inf1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_infneg1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_infneg2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_nan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_neg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big5.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big6.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_big7.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_small1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_small2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/fail/intrinsics/float_to_int_64_too_small3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Directly call intrinsic to avoid debug assertions in libstd
44
#[rustc_intrinsic]
5-
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(_value: Float) -> Int;
5+
unsafe fn float_to_int_unchecked<Float: Copy, Int: Copy>(value: Float) -> Int;
66

77
fn main() {
88
unsafe {

tests/pass/intrinsics/portable-simd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::simd::prelude::*;
1616

1717
#[rustc_intrinsic]
1818
#[rustc_nounwind]
19-
pub unsafe fn simd_shuffle_const_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
19+
pub unsafe fn simd_shuffle_const_generic<T, U, const IDX: &'static [u32]>(x: T, y: T) -> U;
2020

2121
fn simd_ops_f32() {
2222
let a = f32x4::splat(10.0);

0 commit comments

Comments
 (0)