Skip to content

Commit 66d4ea6

Browse files
committed
---
yaml --- r: 182231 b: refs/heads/beta c: 42198c1 h: refs/heads/master i: 182229: 57123dd 182227: e3126bb 182223: 8f68638 v: v3
1 parent 225a936 commit 66d4ea6

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 5f32992b318790b1aca4449c00fe9c8ef999a402
34+
refs/heads/beta: 42198c18f46aa1841ff2870c4841eafae7ec7e8d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/src/librustc_typeck/coherence/impls.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
//! Implementations checker: builtin traits and default impls are allowed just
1212
//! for structs and enums.
1313
14-
use middle::def;
1514
use middle::ty;
1615
use syntax::ast::{Item, ItemImpl};
1716
use syntax::ast;
18-
use syntax::ast_util;
1917
use syntax::visit;
20-
use util::ppaux::UserString;
2118

2219
pub fn check(tcx: &ty::ctxt) {
2320
let mut impls = ImplsChecker { tcx: tcx };

branches/beta/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use ast::{SelfExplicit, SelfRegion, SelfStatic, SelfValue};
5252
use ast::{Delimited, SequenceRepetition, TokenTree, TraitItem, TraitRef};
5353
use ast::{TtDelimited, TtSequence, TtToken};
5454
use ast::{TupleVariantKind, Ty, Ty_, TypeBinding};
55-
use ast::{TypeField, TyFixedLengthVec, TyBareFn};
55+
use ast::{TyFixedLengthVec, TyBareFn};
5656
use ast::{TyTypeof, TyInfer, TypeMethod};
5757
use ast::{TyParam, TyParamBound, TyParen, TyPath, TyPolyTraitRef, TyPtr, TyQPath};
5858
use ast::{TyRptr, TyTup, TyU32, TyVec, UnUniq};

branches/beta/src/test/run-make/tools.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ endif
5151

5252
# Extra flags needed to compile a working executable with the standard library
5353
ifdef IS_WINDOWS
54-
EXTRACFLAGS :=
54+
EXTRACFLAGS := -lws2_32
5555
else
5656
ifeq ($(shell uname),Darwin)
5757
else

0 commit comments

Comments
 (0)