Minor rebase corrections

This commit is contained in:
Niko Matsakis 2016-01-08 21:00:24 -05:00
parent 83710b4471
commit b0f6a47a0f
1 changed files with 2 additions and 1 deletions

View File

@ -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;