diff --git a/src/lib.rs b/src/lib.rs index aadbb0270d..5ed3d8950d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,6 @@ #![warn(rust_2018_idioms)] #![allow(clippy::cast_lossless)] -extern crate rustc_attr; extern crate rustc_apfloat; extern crate rustc_ast; #[macro_use] extern crate rustc_middle; diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index 73419a9f97..fc859bc530 100644 --- a/src/shims/intrinsics.rs +++ b/src/shims/intrinsics.rs @@ -2,9 +2,7 @@ use std::iter; use log::trace; -use rustc_attr as attr; -use rustc_ast::ast::FloatTy; -use rustc_middle::{mir, mir::BinOp, ty}; +use rustc_middle::{mir, mir::BinOp, ty, ty::FloatTy}; use rustc_middle::ty::layout::IntegerExt; use rustc_apfloat::{Float, Round}; use rustc_target::abi::{Align, Integer, LayoutOf}; @@ -578,7 +576,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx Ok(match dest_ty.kind() { // Unsigned ty::Uint(t) => { - let size = Integer::from_attr(this, attr::IntType::UnsignedInt(*t)).size(); + let size = Integer::from_uint_ty(this, *t).size(); let res = f.to_u128(size.bits_usize()); if res.status.is_empty() { // No status flags means there was no further rounding or other loss of precision. @@ -593,7 +591,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx } // Signed ty::Int(t) => { - let size = Integer::from_attr(this, attr::IntType::SignedInt(*t)).size(); + let size = Integer::from_int_ty(this, *t).size(); let res = f.to_i128(size.bits_usize()); if res.status.is_empty() { // No status flags means there was no further rounding or other loss of precision.