diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-01-08 21:00:24 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-01-08 21:00:24 -0500 |
| commit | b0f6a47a0f05af991d8b0e40b29ac8290ac845f5 (patch) | |
| tree | 3f6ec40fdb78689e7295b47d0919a1d47caf0329 | |
| parent | 83710b44716cb078fde8992acc4f28839eefbe51 (diff) | |
| download | rust-b0f6a47a0f05af991d8b0e40b29ac8290ac845f5.tar.gz rust-b0f6a47a0f05af991d8b0e40b29ac8290ac845f5.zip | |
Minor rebase corrections
| -rw-r--r-- | src/librustc_typeck/check/coercion.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs index f91f13f586c..8f64e85de4b 100644 --- a/src/librustc_typeck/check/coercion.rs +++ b/src/librustc_typeck/check/coercion.rs @@ -68,7 +68,8 @@ use middle::traits::{predicate_for_trait_def, report_selection_error}; use middle::ty::adjustment::{AutoAdjustment, AutoDerefRef, AdjustDerefRef}; use middle::ty::adjustment::{AutoPtr, AutoUnsafe, AdjustReifyFnPointer}; use middle::ty::adjustment::{AdjustUnsafeFnPointer}; -use middle::ty::{self, LvaluePreference, TypeAndMut, Ty, HasTypeFlags}; +use middle::ty::{self, LvaluePreference, TypeAndMut, Ty}; +use middle::ty::fold::TypeFoldable; use middle::ty::error::TypeError; use middle::ty::relate::RelateResult; use util::common::indent; |