-use ty::{TyBool, TyChar, TyAdt};
-use ty::{TyError, TyStr, TyArray, TySlice, TyFloat, TyFnDef, TyFnPtr};
-use ty::{TyParam, TyRawPtr, TyRef, TyNever, TyTuple};
-use ty::{TyClosure, TyGenerator, TyGeneratorWitness, TyForeign, TyProjection, TyAnon};
-use ty::{TyDynamic, TyInt, TyUint, TyInfer};
+use ty::{TyBool, TyChar, Adt};
+use ty::{Error, TyStr, Array, Slice, TyFloat, FnDef, FnPtr};
+use ty::{TyParam, RawPtr, Ref, Never, Tuple};
+use ty::{Closure, Generator, GeneratorWitness, TyForeign, Projection, Anon};
+use ty::{Dynamic, TyInt, TyUint, Infer};