nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-03 12:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes and rebase conflicts

Browse Source
This commit is contained in:
Alex Crichton 2015-01-15 15:01:31 -08:00
parent 5f32992b31
commit 42198c18f4
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_typeck/coherence/impls.rs
View File

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

2
src/libsyntax/parse/parser.rs
View File

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

2
src/test/run-make/tools.mk
View File

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