Merge pull request #2240 from Frederick888/fix-2239
Fixes #2239
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 8571e5b..77c7092 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -9,6 +9,7 @@
use rustc::session::Session;
use rustc::traits;
use rustc::ty::{self, Ty, TyCtxt};
+use rustc::ty::layout::LayoutOf;
use rustc_errors;
use std::borrow::Cow;
use std::env;
@@ -1021,9 +1022,9 @@
}
pub fn type_size<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> Option<u64> {
- ty.layout(cx.tcx, cx.param_env)
+ (cx.tcx, cx.param_env).layout_of(ty)
.ok()
- .map(|layout| layout.size(cx.tcx).bytes())
+ .map(|layout| layout.size.bytes())
}
/// Returns true if the lint is allowed in the current context
