Test fixes and rebase conflicts

Author: alexcrichton

src/librustc_typeck/coherence/impls.rs

@@ -11,13 +11,10 @@
 //! Implementations checker: builtin traits and default impls are allowed just
 //! for structs and enums.
 
-use middle::def;
 use middle::ty;
 use syntax::ast::{Item, ItemImpl};
 use syntax::ast;
-use syntax::ast_util;
 use syntax::visit;
-use util::ppaux::UserString;
 
 pub fn check(tcx: &ty::ctxt) {
     let mut impls = ImplsChecker { tcx: tcx };

src/libsyntax/parse/parser.rs

@@ -52,7 +52,7 @@ use ast::{SelfExplicit, SelfRegion, SelfStatic, SelfValue};
 use ast::{Delimited, SequenceRepetition, TokenTree, TraitItem, TraitRef};
 use ast::{TtDelimited, TtSequence, TtToken};
 use ast::{TupleVariantKind, Ty, Ty_, TypeBinding};
-use ast::{TypeField, TyFixedLengthVec, TyBareFn};
+use ast::{TyFixedLengthVec, TyBareFn};
 use ast::{TyTypeof, TyInfer, TypeMethod};
 use ast::{TyParam, TyParamBound, TyParen, TyPath, TyPolyTraitRef, TyPtr, TyQPath};
 use ast::{TyRptr, TyTup, TyU32, TyVec, UnUniq};

src/test/run-make/tools.mk

@@ -51,7 +51,7 @@ endif
 
 # Extra flags needed to compile a working executable with the standard library
 ifdef IS_WINDOWS
-	EXTRACFLAGS :=
+	EXTRACFLAGS := -lws2_32
 else
 ifeq ($(shell uname),Darwin)
 else