From b8751c1fbb6489916a3fea9378e493710d2765ba Mon Sep 17 00:00:00 2001 From: oli Date: Sun, 1 Nov 2020 17:01:34 +0000 Subject: [PATCH] No need for a `zst` constructor method when we can have a constant --- compiler/rustc_middle/src/mir/interpret/value.rs | 2 +- compiler/rustc_middle/src/ty/consts/int.rs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/rustc_middle/src/mir/interpret/value.rs b/compiler/rustc_middle/src/mir/interpret/value.rs index c0fff98dc55..d297482c1b6 100644 --- a/compiler/rustc_middle/src/mir/interpret/value.rs +++ b/compiler/rustc_middle/src/mir/interpret/value.rs @@ -180,7 +180,7 @@ impl<'tcx, Tag> Scalar { #[inline] pub fn zst() -> Self { - Scalar::Int(ScalarInt::zst()) + Scalar::Int(ScalarInt::ZST) } #[inline(always)] diff --git a/compiler/rustc_middle/src/ty/consts/int.rs b/compiler/rustc_middle/src/ty/consts/int.rs index 4b842b75461..f9593c367b9 100644 --- a/compiler/rustc_middle/src/ty/consts/int.rs +++ b/compiler/rustc_middle/src/ty/consts/int.rs @@ -183,11 +183,6 @@ impl ScalarInt { ); } - #[inline] - pub fn zst() -> Self { - Self::null(Size::ZERO) - } - #[inline] pub fn null(size: Size) -> Self { Self { data: 0, size: size.bytes() as u8 }