Rename ArgumentSizeMismatch to ScalarSizeMismatch

diff --git a/src/librustc_middle/mir/interpret/error.rs b/src/librustc_middle/mir/interpret/error.rs
index 71a9382bc65c476ead6906fbcdc190349d1642dc..875b514e8c81f816594f4c04ca6c1c38c7509f7a 100644 (file)
--- a/src/librustc_middle/mir/interpret/error.rs
+++ b/src/librustc_middle/mir/interpret/error.rs
@@ -362,7 +362,7 @@ pub enum UndefinedBehaviorInfo {
     /// Working with a local that is not currently live.
     DeadLocal,
     /// Data size is not equal to target size
-    ArgumentSizeMismatch {
+    ScalarSizeMismatch {
         target_size: u64,
         data_size: u64,
     },
@@ -427,9 +427,9 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 "using uninitialized data, but this operation requires initialized memory"
             ),
             DeadLocal => write!(f, "accessing a dead local variable"),
-            ArgumentSizeMismatch { target_size, data_size } => write!(
+            ScalarSizeMismatch { target_size, data_size } => write!(
                 f,
-                "argument size mismatch: expected {} bytes but got {} bytes instead",
+                "scalar size mismatch: expected {} bytes but got {} bytes instead",
                 target_size, data_size
             ),
         }

diff --git a/src/librustc_middle/mir/interpret/value.rs b/src/librustc_middle/mir/interpret/value.rs
index c11e50015087bf3010536f8ce4d1fb36db88ab24..6e013f75ed7590fa148e175fbe230d943aabcbe4 100644 (file)
--- a/src/librustc_middle/mir/interpret/value.rs
+++ b/src/librustc_middle/mir/interpret/value.rs
@@ -394,9 +394,9 @@ fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
         match self {
             Scalar::Raw { data, size } => {
                 if target_size.bytes() != u64::from(size) {
-                    throw_ub!(ArgumentSizeMismatch {
+                    throw_ub!(ScalarSizeMismatch {
                         target_size: target_size.bytes(),
-                        data_size: u64::from(size)
+                        data_size: u64::from(size),
                     });
                 }
                 Scalar::check_data(data, size);