Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-15 01:17:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2240 from Frederick888/fix-2239

Browse source 
Fixes #2239
This commit is contained in:
Oliver Schneider 2017-11-21 08:12:35 +01:00 committed by GitHub
commit 30a663f17c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clippy_lints/src/utils/mod.rs
View file

@ -9,6 +9,7 @@ use rustc::lint::{LateContext, Level, Lint, LintContext};
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 is_try(expr: &Expr) -> Option<&Expr> {
}
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