X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_typeck%2Fmem_categorization.rs;h=d3d0aa2e5807fc8b99d9896575488135c3d33e76;hb=cecffb63086407b06612b32667a52ba1e94b092c;hp=4c5e7c81b27ff0983b102251b3267e71ebff42fc;hpb=aaca5f1d76cdb4d06dc0318e81493b9ae743cbc5;p=rust.git diff --git a/src/librustc_typeck/mem_categorization.rs b/src/librustc_typeck/mem_categorization.rs index 4c5e7c81b27..d3d0aa2e580 100644 --- a/src/librustc_typeck/mem_categorization.rs +++ b/src/librustc_typeck/mem_categorization.rs @@ -48,18 +48,16 @@ //! result of `*x'`, effectively, where `x'` is a `Categorization::Upvar` reference //! tied to `x`. The type of `x'` will be a borrowed pointer. -use rustc::hir; -use rustc::hir::def::{DefKind, Res}; -use rustc::hir::def_id::DefId; -use rustc::hir::PatKind; use rustc::infer::InferCtxt; use rustc::ty::adjustment; use rustc::ty::fold::TypeFoldable; use rustc::ty::{self, Ty, TyCtxt}; - -use rustc_span::Span; - use rustc_data_structures::fx::FxIndexMap; +use rustc_hir as hir; +use rustc_hir::def::{DefKind, Res}; +use rustc_hir::def_id::DefId; +use rustc_hir::PatKind; +use rustc_span::Span; #[derive(Clone, Debug)] pub enum PlaceBase { @@ -347,7 +345,7 @@ fn cat_expr_adjusted_with( let expr_ty = self.expr_ty(expr)?; match expr.kind { - hir::ExprKind::Unary(hir::UnDeref, ref e_base) => { + hir::ExprKind::Unary(hir::UnOp::UnDeref, ref e_base) => { if self.tables.is_method_call(expr) { self.cat_overloaded_place(expr, e_base) } else {