From 5226b664a17f8b91b577bab4df217ad07ebd0dce Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Mon, 5 Feb 2018 12:16:17 +0800
Subject: [PATCH] Rustup to rustc 1.25.0-nightly (0c6091fbd 2018-02-04)

---
 clippy_lints/src/utils/mod.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 7cb3e08a116d..9cb67d4da413 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -9,7 +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, Align};
+use rustc::ty::layout::Align;
 use rustc_errors;
 use std::borrow::Cow;
 use std::env;
@@ -1038,7 +1038,7 @@ pub fn is_try(expr: &Expr) -> Option<&Expr> {
 }
 
 pub fn type_size<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> Option<u64> {
-    (cx.tcx, cx.param_env).layout_of(ty)
+    cx.tcx.layout_of(cx.param_env.and(ty))
         .ok()
         .map(|layout| layout.size.bytes())
 }
@@ -1060,5 +1060,7 @@ pub fn get_arg_name(pat: &Pat) -> Option<ast::Name> {
 
 /// Returns alignment for a type, or None if alignment is undefined
 pub fn alignment<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> Option<Align> {
-    (cx.tcx, cx.param_env).layout_of(ty).ok().map(|layout| layout.align)
+    cx.tcx.layout_of(cx.param_env.and(ty))
+        .ok()
+        .map(|layout| layout.align)
 }