diff options
| author | Samrat Man Singh <samratmansingh@gmail.com> | 2020-04-26 20:11:14 +0530 |
|---|---|---|
| committer | Samrat Man Singh <samratmansingh@gmail.com> | 2020-04-26 20:13:59 +0530 |
| commit | b8af409a51138d46951d4fc49d3d2edd3346ecd5 (patch) | |
| tree | 0e66f379a81a14adcfc36119eb41c0b684eaeeac | |
| parent | 91462db9f1c1b5db941c22efb64e7ec01d472911 (diff) | |
| download | rust-b8af409a51138d46951d4fc49d3d2edd3346ecd5.tar.gz rust-b8af409a51138d46951d4fc49d3d2edd3346ecd5.zip | |
Rename ArgumentSizeMismatch to ScalarSizeMismatch
| -rw-r--r-- | src/librustc_middle/mir/interpret/error.rs | 6 | ||||
| -rw-r--r-- | src/librustc_middle/mir/interpret/value.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_middle/mir/interpret/error.rs b/src/librustc_middle/mir/interpret/error.rs index 71a9382bc65..875b514e8c8 100644 --- 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 @@ impl fmt::Debug for UndefinedBehaviorInfo { "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 c11e5001508..6e013f75ed7 100644 --- a/src/librustc_middle/mir/interpret/value.rs +++ b/src/librustc_middle/mir/interpret/value.rs @@ -394,9 +394,9 @@ impl<'tcx, Tag> Scalar<Tag> { 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); |
