Fix merge conflicts from making enum variants namespaced.

src/librustc/middle/fast_reject.rs

@@ -11,6 +11,8 @@
 use middle::ty;
 use syntax::ast;
 
+use self::SimplifiedType::*;
+
 /** See `simplify_type */
 #[deriving(Clone, PartialEq, Eq, Hash)]
 pub enum SimplifiedType {

src/librustc/middle/traits/select.rs

@@ -33,6 +33,7 @@
 use middle::ty;
 use middle::typeck::check::regionmanip;
 use middle::typeck::infer;
+use middle::typeck::infer::LateBoundRegionConversionTime::*;
 use middle::typeck::infer::{InferCtxt, TypeSkolemizer};
 use middle::ty_fold::TypeFoldable;
 use std::cell::RefCell;

src/librustc/middle/typeck/check/method/mod.rs

@@ -30,6 +30,9 @@
 use syntax::ast;
 use syntax::codemap::Span;
 
+pub use self::MethodError::*;
+pub use self::CandidateSource::*;
+
 mod confirm;
 mod doc;
 mod probe;

src/librustc/middle/typeck/check/method/probe.rs

@@ -8,13 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use super::Ambiguity;
-use super::CandidateSource;
-use super::ImplSource;
-use super::MethodError;
+use super::{MethodError,Ambiguity,NoMatch};
 use super::MethodIndex;
-use super::NoMatch;
-use super::TraitSource;
+use super::{CandidateSource,ImplSource,TraitSource};
 
 use middle::fast_reject;
 use middle::subst;
@@ -32,6 +28,10 @@
 use std::rc::Rc;
 use util::ppaux::Repr;
 
+use self::CandidateKind::*;
+pub use self::PickAdjustment::*;
+pub use self::PickKind::*;
+
 struct ProbeContext<'a, 'tcx:'a> {
     fcx: &'a FnCtxt<'a, 'tcx>,
     span: Span,

src/librustc/middle/typeck/infer/glb.rs

@@ -15,8 +15,8 @@
 use middle::typeck::infer::combine::*;
 use middle::typeck::infer::lattice::*;
 use middle::typeck::infer::equate::Equate;
-use middle::typeck::infer::FnType;
 use middle::typeck::infer::fold_regions_in_sig;
+use middle::typeck::infer::LateBoundRegionConversionTime::FnType;
 use middle::typeck::infer::lub::Lub;
 use middle::typeck::infer::region_inference::RegionMark;
 use middle::typeck::infer::sub::Sub;

src/librustc/middle/typeck/infer/lub.rs

@@ -13,9 +13,9 @@
 use middle::ty;
 use middle::typeck::infer::combine::*;
 use middle::typeck::infer::equate::Equate;
-use middle::typeck::infer::FnType;
 use middle::typeck::infer::glb::Glb;
 use middle::typeck::infer::lattice::*;
+use middle::typeck::infer::LateBoundRegionConversionTime::FnType;
 use middle::typeck::infer::sub::Sub;
 use middle::typeck::infer::{cres, InferCtxt};
 use middle::typeck::infer::fold_regions_in_sig;

src/librustc/middle/typeck/infer/mod.rs

@@ -12,10 +12,11 @@
 
 #![allow(non_camel_case_types)]
 
+pub use self::LateBoundRegionConversionTime::*;
+pub use self::RegionVariableOrigin::*;
+pub use self::SubregionOrigin::*;
 pub use self::TypeOrigin::*;
 pub use self::ValuePairs::*;
-pub use self::SubregionOrigin::*;
-pub use self::RegionVariableOrigin::*;
 pub use self::fixup_err::*;
 pub use middle::ty::IntVarValue;
 pub use self::resolve::resolve_and_force_all_but_regions;

src/librustc/middle/typeck/infer/sub.rs

@@ -16,7 +16,7 @@
 use middle::typeck::infer::combine::*;
 use middle::typeck::infer::{cres, CresCompare};
 use middle::typeck::infer::equate::Equate;
-use middle::typeck::infer::FnType;
+use middle::typeck::infer::LateBoundRegionConversionTime::FnType;
 use middle::typeck::infer::glb::Glb;
 use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::lub::Lub;