From 538c271e0594ce6b1cc8ee420eaba0e70286ea65 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 26 Apr 2017 12:15:42 +0200
Subject: [PATCH] Address clippy lints

---
 src/eval_context.rs   | 12 ++++--------
 src/lvalue.rs         |  2 +-
 src/memory.rs         |  2 +-
 src/terminator/mod.rs |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/eval_context.rs b/src/eval_context.rs
index 2ae5fcf5cfe2..28a08a8c2094 100644
--- a/src/eval_context.rs
+++ b/src/eval_context.rs
@@ -1285,9 +1285,9 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
             ty::TyRef(_, ref tam) |
             ty::TyRawPtr(ref tam) if self.type_is_sized(tam.ty) => PrimValKind::Ptr,
 
-            ty::TyAdt(ref def, _) if def.is_box() => PrimValKind::Ptr,
+            ty::TyAdt(def, _) if def.is_box() => PrimValKind::Ptr,
 
-            ty::TyAdt(ref def, substs) => {
+            ty::TyAdt(def, substs) => {
                 use rustc::ty::layout::Layout::*;
                 match *self.type_layout(ty)? {
                     CEnum { discr, signed, .. } => {
@@ -1954,12 +1954,8 @@ pub fn needs_drop_glue<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, t: Ty<'tcx>) -> bo
             if !typ.needs_drop(tcx, &env) && type_is_sized(tcx, typ) {
                 tcx.infer_ctxt((), traits::Reveal::All).enter(|infcx| {
                     let layout = t.layout(&infcx).unwrap();
-                    if layout.size(&tcx.data_layout).bytes() == 0 {
-                        // `Box<ZeroSizeType>` does not allocate.
-                        false
-                    } else {
-                        true
-                    }
+                    // `Box<ZeroSizeType>` does not allocate.
+                    layout.size(&tcx.data_layout).bytes() != 0
                 })
             } else {
                 true
diff --git a/src/lvalue.rs b/src/lvalue.rs
index 45d9501458d7..0f1ce103b0c4 100644
--- a/src/lvalue.rs
+++ b/src/lvalue.rs
@@ -322,7 +322,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                 let pointee_type = match base_ty.sty {
                     ty::TyRawPtr(ref tam) |
                     ty::TyRef(_, ref tam) => tam.ty,
-                    ty::TyAdt(ref def, _) if def.is_box() => base_ty.boxed_ty(),
+                    ty::TyAdt(def, _) if def.is_box() => base_ty.boxed_ty(),
                     _ => bug!("can only deref pointer types"),
                 };
 
diff --git a/src/memory.rs b/src/memory.rs
index 3d46d710d3dd..f2440d3d7267 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -202,7 +202,7 @@ impl<'a, 'tcx> Memory<'a, 'tcx> {
         if size == 0 {
             return Ok(Pointer::zst_ptr());
         }
-        assert!(align != 0);
+        assert_ne!(align, 0);
 
         if self.memory_size - self.memory_usage < size {
             return Err(EvalError::OutOfMemory {
diff --git a/src/terminator/mod.rs b/src/terminator/mod.rs
index 03804ccd0bd5..0c0239f59269 100644
--- a/src/terminator/mod.rs
+++ b/src/terminator/mod.rs
@@ -298,7 +298,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                 let pointee_type = match ty.sty {
                     ty::TyRawPtr(ref tam) |
                     ty::TyRef(_, ref tam) => tam.ty,
-                    ty::TyAdt(ref def, _) if def.is_box() => ty.boxed_ty(),
+                    ty::TyAdt(def, _) if def.is_box() => ty.boxed_ty(),
                     _ => bug!("can only deref pointer types"),
                 };
                 self.drop(val, instance, pointee_type, span)