Skip to content

Commit 4c9c2dd

Browse files
flaper87flaper87
committed
---
yaml --- r: 81301 b: refs/heads/snap-stage3 c: d379ff4 h: refs/heads/master i: 81299: c8096b4 v: v3
1 parent 2b984f6 commit 4c9c2dd

39 files changed

+382
-488
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5e4ae4f45fab7ce1a984d5b5281e129f76486d10
4+
refs/heads/snap-stage3: d379ff474fac357f599d111f364449f2a6aaf3cb
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/mk/tests.mk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,6 @@ tidy:
261261
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
262262
$(Q)echo $(ALL_HS) \
263263
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
264-
$(Q)find $(S)src -type f -perm +111 \
265-
-not -name '*.rs' -and -not -name '*.py' \
266-
-and -not -name '*.sh' \
267-
| grep '^$(S)src/llvm' -v \
268-
| grep '^$(S)src/libuv' -v \
269-
| grep '^$(S)src/gyp' -v \
270-
| grep '^$(S)src/etc' -v \
271-
| grep '^$(S)src/rt/jemalloc' -v \
272-
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
273264

274265
endif
275266

‎branches/snap-stage3/src/etc/check-binaries.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎branches/snap-stage3/src/librustc/metadata/encoder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ fn encode_crate_deps(ecx: &EncodeContext,
15741574
fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
15751575
ebml_w.start_tag(tag_lang_items);
15761576

1577-
for (i, def_id) in ecx.tcx.lang_items.items() {
1577+
do ecx.tcx.lang_items.each_item |def_id, i| {
15781578
for id in def_id.iter() {
15791579
if id.crate == LOCAL_CRATE {
15801580
ebml_w.start_tag(tag_lang_items_item);
@@ -1590,7 +1590,8 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
15901590
ebml_w.end_tag(); // tag_lang_items_item
15911591
}
15921592
}
1593-
}
1593+
true
1594+
};
15941595

15951596
ebml_w.end_tag(); // tag_lang_items
15961597
}

‎branches/snap-stage3/src/librustc/middle/check_match.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
121121
for pat in arm.pats.iter() {
122122

123123
// Check that we do not match against a static NaN (#6804)
124-
let pat_matches_nan: &fn(&Pat) -> bool = |p| {
124+
let pat_matches_nan: &fn(@Pat) -> bool = |p| {
125125
match cx.tcx.def_map.find(&p.id) {
126126
Some(&DefStatic(did, false)) => {
127127
let const_expr = lookup_const_by_id(cx.tcx, did).unwrap();
@@ -893,7 +893,7 @@ pub fn check_legality_of_move_bindings(cx: &MatchCheckCtxt,
893893
}
894894
}
895895

896-
let check_move: &fn(&Pat, Option<@Pat>) = |p, sub| {
896+
let check_move: &fn(@Pat, Option<@Pat>) = |p, sub| {
897897
// check legality of moving out of the enum
898898

899899
// x @ Foo(*) is legal, but x @ Foo(y) isn't.

‎branches/snap-stage3/src/librustc/middle/dataflow.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
422422
}
423423

424424
fn walk_expr(&mut self,
425-
expr: &ast::Expr,
425+
expr: @ast::Expr,
426426
in_out: &mut [uint],
427427
loop_scopes: &mut ~[LoopScope]) {
428428
debug!("DataFlowContext::walk_expr(expr=%s, in_out=%s)",
@@ -744,7 +744,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
744744
}
745745

746746
fn pop_scopes(&mut self,
747-
from_expr: &ast::Expr,
747+
from_expr: @ast::Expr,
748748
to_scope: &mut LoopScope,
749749
in_out: &mut [uint]) {
750750
//! Whenever you have a `break` or a `loop` statement, flow
@@ -778,7 +778,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
778778
}
779779

780780
fn break_from_to(&mut self,
781-
from_expr: &ast::Expr,
781+
from_expr: @ast::Expr,
782782
to_scope: &mut LoopScope,
783783
in_out: &mut [uint]) {
784784
self.pop_scopes(from_expr, to_scope, in_out);
@@ -811,7 +811,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
811811
fn walk_call(&mut self,
812812
_callee_id: ast::NodeId,
813813
call_id: ast::NodeId,
814-
arg0: &ast::Expr,
814+
arg0: @ast::Expr,
815815
args: &[@ast::Expr],
816816
in_out: &mut [uint],
817817
loop_scopes: &mut ~[LoopScope]) {
@@ -865,7 +865,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
865865
}
866866

867867
fn find_scope<'a>(&self,
868-
expr: &ast::Expr,
868+
expr: @ast::Expr,
869869
label: Option<ast::Name>,
870870
loop_scopes: &'a mut ~[LoopScope]) -> &'a mut LoopScope {
871871
let index = match label {
@@ -899,7 +899,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
899899
&mut loop_scopes[index]
900900
}
901901

902-
fn is_method_call(&self, expr: &ast::Expr) -> bool {
902+
fn is_method_call(&self, expr: @ast::Expr) -> bool {
903903
self.dfcx.method_map.contains_key(&expr.id)
904904
}
905905

‎branches/snap-stage3/src/librustc/middle/lang_items.rs

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ use syntax::visit;
3232
use syntax::visit::Visitor;
3333

3434
use std::hashmap::HashMap;
35-
use std::iter::Enumerate;
36-
use std::vec;
3735

3836
pub enum LangItem {
3937
FreezeTraitLangItem, // 0
@@ -94,8 +92,8 @@ impl LanguageItems {
9492
}
9593
}
9694

97-
pub fn items<'a>(&'a self) -> Enumerate<vec::VecIterator<'a, Option<DefId>>> {
98-
self.items.iter().enumerate()
95+
pub fn each_item(&self, f: &fn(Option<DefId>, uint) -> bool) -> bool {
96+
self.items.iter().enumerate().advance(|(i, &item)| f(item, i))
9997
}
10098

10199
pub fn item_name(index: uint) -> &'static str {
@@ -300,7 +298,7 @@ struct LanguageItemCollector<'self> {
300298
crate: &'self Crate,
301299
session: Session,
302300

303-
item_refs: HashMap<&'static str, uint>,
301+
item_refs: HashMap<@str, uint>,
304302
}
305303

306304
struct LanguageItemVisitor<'self> {
@@ -329,51 +327,51 @@ impl<'self> LanguageItemCollector<'self> {
329327
-> LanguageItemCollector<'a> {
330328
let mut item_refs = HashMap::new();
331329

332-
item_refs.insert("freeze", FreezeTraitLangItem as uint);
333-
item_refs.insert("send", SendTraitLangItem as uint);
334-
item_refs.insert("sized", SizedTraitLangItem as uint);
335-
336-
item_refs.insert("drop", DropTraitLangItem as uint);
337-
338-
item_refs.insert("add", AddTraitLangItem as uint);
339-
item_refs.insert("sub", SubTraitLangItem as uint);
340-
item_refs.insert("mul", MulTraitLangItem as uint);
341-
item_refs.insert("div", DivTraitLangItem as uint);
342-
item_refs.insert("rem", RemTraitLangItem as uint);
343-
item_refs.insert("neg", NegTraitLangItem as uint);
344-
item_refs.insert("not", NotTraitLangItem as uint);
345-
item_refs.insert("bitxor", BitXorTraitLangItem as uint);
346-
item_refs.insert("bitand", BitAndTraitLangItem as uint);
347-
item_refs.insert("bitor", BitOrTraitLangItem as uint);
348-
item_refs.insert("shl", ShlTraitLangItem as uint);
349-
item_refs.insert("shr", ShrTraitLangItem as uint);
350-
item_refs.insert("index", IndexTraitLangItem as uint);
351-
352-
item_refs.insert("eq", EqTraitLangItem as uint);
353-
item_refs.insert("ord", OrdTraitLangItem as uint);
354-
355-
item_refs.insert("str_eq", StrEqFnLangItem as uint);
356-
item_refs.insert("uniq_str_eq", UniqStrEqFnLangItem as uint);
357-
item_refs.insert("fail_", FailFnLangItem as uint);
358-
item_refs.insert("fail_bounds_check",
330+
item_refs.insert(@"freeze", FreezeTraitLangItem as uint);
331+
item_refs.insert(@"send", SendTraitLangItem as uint);
332+
item_refs.insert(@"sized", SizedTraitLangItem as uint);
333+
334+
item_refs.insert(@"drop", DropTraitLangItem as uint);
335+
336+
item_refs.insert(@"add", AddTraitLangItem as uint);
337+
item_refs.insert(@"sub", SubTraitLangItem as uint);
338+
item_refs.insert(@"mul", MulTraitLangItem as uint);
339+
item_refs.insert(@"div", DivTraitLangItem as uint);
340+
item_refs.insert(@"rem", RemTraitLangItem as uint);
341+
item_refs.insert(@"neg", NegTraitLangItem as uint);
342+
item_refs.insert(@"not", NotTraitLangItem as uint);
343+
item_refs.insert(@"bitxor", BitXorTraitLangItem as uint);
344+
item_refs.insert(@"bitand", BitAndTraitLangItem as uint);
345+
item_refs.insert(@"bitor", BitOrTraitLangItem as uint);
346+
item_refs.insert(@"shl", ShlTraitLangItem as uint);
347+
item_refs.insert(@"shr", ShrTraitLangItem as uint);
348+
item_refs.insert(@"index", IndexTraitLangItem as uint);
349+
350+
item_refs.insert(@"eq", EqTraitLangItem as uint);
351+
item_refs.insert(@"ord", OrdTraitLangItem as uint);
352+
353+
item_refs.insert(@"str_eq", StrEqFnLangItem as uint);
354+
item_refs.insert(@"uniq_str_eq", UniqStrEqFnLangItem as uint);
355+
item_refs.insert(@"fail_", FailFnLangItem as uint);
356+
item_refs.insert(@"fail_bounds_check",
359357
FailBoundsCheckFnLangItem as uint);
360-
item_refs.insert("exchange_malloc", ExchangeMallocFnLangItem as uint);
361-
item_refs.insert("closure_exchange_malloc", ClosureExchangeMallocFnLangItem as uint);
362-
item_refs.insert("exchange_free", ExchangeFreeFnLangItem as uint);
363-
item_refs.insert("malloc", MallocFnLangItem as uint);
364-
item_refs.insert("free", FreeFnLangItem as uint);
365-
item_refs.insert("borrow_as_imm", BorrowAsImmFnLangItem as uint);
366-
item_refs.insert("borrow_as_mut", BorrowAsMutFnLangItem as uint);
367-
item_refs.insert("return_to_mut", ReturnToMutFnLangItem as uint);
368-
item_refs.insert("check_not_borrowed",
358+
item_refs.insert(@"exchange_malloc", ExchangeMallocFnLangItem as uint);
359+
item_refs.insert(@"closure_exchange_malloc", ClosureExchangeMallocFnLangItem as uint);
360+
item_refs.insert(@"exchange_free", ExchangeFreeFnLangItem as uint);
361+
item_refs.insert(@"malloc", MallocFnLangItem as uint);
362+
item_refs.insert(@"free", FreeFnLangItem as uint);
363+
item_refs.insert(@"borrow_as_imm", BorrowAsImmFnLangItem as uint);
364+
item_refs.insert(@"borrow_as_mut", BorrowAsMutFnLangItem as uint);
365+
item_refs.insert(@"return_to_mut", ReturnToMutFnLangItem as uint);
366+
item_refs.insert(@"check_not_borrowed",
369367
CheckNotBorrowedFnLangItem as uint);
370-
item_refs.insert("strdup_uniq", StrDupUniqFnLangItem as uint);
371-
item_refs.insert("record_borrow", RecordBorrowFnLangItem as uint);
372-
item_refs.insert("unrecord_borrow", UnrecordBorrowFnLangItem as uint);
373-
item_refs.insert("start", StartFnLangItem as uint);
374-
item_refs.insert("ty_desc", TyDescStructLangItem as uint);
375-
item_refs.insert("ty_visitor", TyVisitorTraitLangItem as uint);
376-
item_refs.insert("opaque", OpaqueStructLangItem as uint);
368+
item_refs.insert(@"strdup_uniq", StrDupUniqFnLangItem as uint);
369+
item_refs.insert(@"record_borrow", RecordBorrowFnLangItem as uint);
370+
item_refs.insert(@"unrecord_borrow", UnrecordBorrowFnLangItem as uint);
371+
item_refs.insert(@"start", StartFnLangItem as uint);
372+
item_refs.insert(@"ty_desc", TyDescStructLangItem as uint);
373+
item_refs.insert(@"ty_visitor", TyVisitorTraitLangItem as uint);
374+
item_refs.insert(@"opaque", OpaqueStructLangItem as uint);
377375

378376
LanguageItemCollector {
379377
crate: crate,
@@ -418,8 +416,8 @@ impl<'self> LanguageItemCollector<'self> {
418416
return; // Didn't match.
419417
}
420418

421-
let item_index = self.item_refs.find_equiv(&value).map_move(|x| *x);
422-
// prevent borrow checker from considering ^~~~~~~~~~~
419+
let item_index = self.item_refs.find(&value).map_move(|x| *x);
420+
// prevent borrow checker from considering ^~~~~~~~~~~
423421
// self to be borrowed (annoying)
424422

425423
match item_index {

‎branches/snap-stage3/src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5363,7 +5363,7 @@ impl Resolver {
53635363
}
53645364

53655365
pub fn enforce_default_binding_mode(&mut self,
5366-
pat: &Pat,
5366+
pat: @Pat,
53675367
pat_binding_mode: BindingMode,
53685368
descr: &str) {
53695369
match pat_binding_mode {

‎branches/snap-stage3/src/librustc/middle/trans/_match.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ fn insert_lllocals(bcx: @mut Block,
13981398
}
13991399

14001400
fn compile_guard(bcx: @mut Block,
1401-
guard_expr: &ast::Expr,
1401+
guard_expr: @ast::Expr,
14021402
data: &ArmData,
14031403
m: &[Match],
14041404
vals: &[ValueRef],
@@ -1826,7 +1826,7 @@ fn compile_submatch_continue(mut bcx: @mut Block,
18261826

18271827
pub fn trans_match(bcx: @mut Block,
18281828
match_expr: &ast::Expr,
1829-
discr_expr: &ast::Expr,
1829+
discr_expr: @ast::Expr,
18301830
arms: &[ast::Arm],
18311831
dest: Dest) -> @mut Block {
18321832
let _icx = push_ctxt("match::trans_match");
@@ -1876,7 +1876,7 @@ fn create_bindings_map(bcx: @mut Block, pat: @ast::Pat) -> BindingsMap {
18761876
}
18771877

18781878
fn trans_match_inner(scope_cx: @mut Block,
1879-
discr_expr: &ast::Expr,
1879+
discr_expr: @ast::Expr,
18801880
arms: &[ast::Arm],
18811881
dest: Dest) -> @mut Block {
18821882
let _icx = push_ctxt("match::trans_match_inner");

0 commit comments

Comments
 (0)