From 42198c18f46aa1841ff2870c4841eafae7ec7e8d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 15 Jan 2015 15:01:31 -0800
Subject: [PATCH] Test fixes and rebase conflicts

---
 src/librustc_typeck/coherence/impls.rs | 3 ---
 src/libsyntax/parse/parser.rs          | 2 +-
 src/test/run-make/tools.mk             | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/librustc_typeck/coherence/impls.rs b/src/librustc_typeck/coherence/impls.rs
index 9b53cbe84e7..2719a09f4f5 100644
--- a/src/librustc_typeck/coherence/impls.rs
+++ b/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 };
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 2813f94a845..30cc9836374 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/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};
diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk
index f5027618814..365cbf93da2 100644
--- a/src/test/run-make/tools.mk
+++ b/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