Skip to content

Commit 88072dd

Browse files
brsonbrson
committed
---
yaml --- r: 65786 b: refs/heads/master c: 48c7bc1 h: refs/heads/master v: v3
1 parent 77364ea commit 88072dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+638
-515
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: bbe3d4a9dc7eae6b53871d0a59d56372c2c03479
2+
refs/heads/master: 48c7bc17c68032d142dd6ce53b8f5933d52c2165
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

‎trunk/src/compiletest/procsrv.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use core::prelude::*;
12-
use core::iterator::IteratorUtil;
1312

1413
use core::os;
1514
use core::run;
@@ -59,7 +58,7 @@ pub fn run(lib_path: &str,
5958
err_fd: None
6059
});
6160

62-
for input.iter().advance |input| {
61+
for input.each |input| {
6362
proc.input().write_str(*input);
6463
}
6564
let output = proc.finish_with_output();

‎trunk/src/libextra/par.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ pub fn any<A:Copy + Owned>(
139139
fn_factory: &fn() -> ~fn(&A) -> bool) -> bool {
140140
let mapped = map_slices(xs, || {
141141
let f = fn_factory();
142-
let result: ~fn(uint, &[A]) -> bool = |_, slice| slice.iter().any_(f);
142+
let result: ~fn(uint, &[A]) -> bool = |_, slice| slice.iter().any(f);
143143
result
144144
});
145-
mapped.iter().any_(|&x| x)
145+
mapped.iter().any(|&x| x)
146146
}

‎trunk/src/libextra/treemap.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ impl<T: TotalOrd> Set<T> for TreeSet<T> {
427427
b = y.next();
428428
}
429429
}
430-
b.iter().advance(|&x| f(x)) && y.advance(f)
430+
return b.each(|&x| f(x)) && y.advance(f);
431431
}
432432

433433
/// Visit the values (in-order) representing the intersection
@@ -485,7 +485,7 @@ impl<T: TotalOrd> Set<T> for TreeSet<T> {
485485
a = x.next();
486486
}
487487
}
488-
b.iter().advance(|&x| f(x)) && y.advance(f)
488+
return b.each(|&x| f(x)) && y.advance(f);
489489
}
490490
}
491491

@@ -527,14 +527,14 @@ impl<K: TotalOrd, V> TreeNode<K, V> {
527527

528528
fn each<'r, K: TotalOrd, V>(node: &'r Option<~TreeNode<K, V>>,
529529
f: &fn(&'r K, &'r V) -> bool) -> bool {
530-
node.iter().advance(|x| each(&x.left, f) && f(&x.key, &x.value) &&
531-
each(&x.right, f))
530+
node.each(|x| each(&x.left, f) && f(&x.key, &x.value) &&
531+
each(&x.right, f))
532532
}
533533

534534
fn each_reverse<'r, K: TotalOrd, V>(node: &'r Option<~TreeNode<K, V>>,
535535
f: &fn(&'r K, &'r V) -> bool) -> bool {
536-
node.iter().advance(|x| each_reverse(&x.right, f) && f(&x.key, &x.value) &&
537-
each_reverse(&x.left, f))
536+
node.each(|x| each_reverse(&x.right, f) && f(&x.key, &x.value) &&
537+
each_reverse(&x.left, f))
538538
}
539539

540540
fn mutate_values<'r, K: TotalOrd, V>(node: &'r mut Option<~TreeNode<K, V>>,
@@ -625,7 +625,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
625625
fn heir_swap<K: TotalOrd, V>(node: &mut ~TreeNode<K, V>,
626626
child: &mut Option<~TreeNode<K, V>>) {
627627
// *could* be done without recursion, but it won't borrow check
628-
for child.mut_iter().advance |x| {
628+
for child.each_mut |x| {
629629
if x.right.is_some() {
630630
heir_swap(node, &mut x.right);
631631
} else {
@@ -680,18 +680,18 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
680680
save.level -= 1;
681681

682682
if right_level > save.level {
683-
for save.right.mut_iter().advance |x| { x.level = save.level }
683+
for save.right.each_mut |x| { x.level = save.level }
684684
}
685685

686686
skew(save);
687687

688-
for save.right.mut_iter().advance |right| {
688+
for save.right.each_mut |right| {
689689
skew(right);
690-
for right.right.mut_iter().advance |x| { skew(x) }
690+
for right.right.each_mut |x| { skew(x) }
691691
}
692692

693693
split(save);
694-
for save.right.mut_iter().advance |x| { split(x) }
694+
for save.right.each_mut |x| { split(x) }
695695
}
696696

697697
return ret;
@@ -1111,7 +1111,6 @@ mod test_set {
11111111

11121112
let mut n = 0;
11131113
for m.each |x| {
1114-
println(fmt!("%?", x));
11151114
assert_eq!(*x, n);
11161115
n += 1
11171116
}

‎trunk/src/librust/rust.rc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ extern mod rusti;
3030
extern mod rustc;
3131

3232
use core::prelude::*;
33-
use core::iterator::IteratorUtil;
3433

3534
use core::io;
3635
use core::os;
@@ -243,8 +242,7 @@ pub fn main() {
243242
let args = os_args.tail();
244243

245244
if !args.is_empty() {
246-
let r = find_cmd(*args.head());
247-
for r.iter().advance |command| {
245+
for find_cmd(*args.head()).each |command| {
248246
let result = do_command(command, args.tail());
249247
match result {
250248
Valid(exit_code) => unsafe { exit(exit_code.to_i32()) },

‎trunk/src/librustc/metadata/encoder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use middle::ty;
2222
use middle;
2323
use util::ppaux::ty_to_str;
2424

25-
use core::iterator::IteratorUtil;
2625
use core::hash::HashUtil;
2726
use core::hashmap::HashMap;
2827
use core::int;
@@ -121,7 +120,7 @@ fn encode_region_param(ecx: @EncodeContext,
121120
ebml_w: &mut writer::Encoder,
122121
it: @ast::item) {
123122
let opt_rp = ecx.tcx.region_paramd_items.find(&it.id);
124-
for opt_rp.iter().advance |rp| {
123+
for opt_rp.each |rp| {
125124
ebml_w.start_tag(tag_region_param);
126125
rp.encode(ebml_w);
127126
ebml_w.end_tag();
@@ -241,7 +240,7 @@ fn encode_type(ecx: @EncodeContext,
241240
fn encode_transformed_self_ty(ecx: @EncodeContext,
242241
ebml_w: &mut writer::Encoder,
243242
opt_typ: Option<ty::t>) {
244-
for opt_typ.iter().advance |&typ| {
243+
for opt_typ.each |&typ| {
245244
ebml_w.start_tag(tag_item_method_transformed_self_ty);
246245
write_type(ecx, ebml_w, typ);
247246
ebml_w.end_tag();
@@ -957,7 +956,7 @@ fn encode_info_for_item(ecx: @EncodeContext,
957956
ebml_w.writer.write(str::to_bytes(def_to_str(method_def_id)));
958957
ebml_w.end_tag();
959958
}
960-
for opt_trait.iter().advance |ast_trait_ref| {
959+
for opt_trait.each |ast_trait_ref| {
961960
let trait_ref = ty::node_id_to_trait_ref(ecx.tcx, ast_trait_ref.ref_id);
962961
encode_trait_ref(ebml_w, ecx, trait_ref, tag_item_trait_ref);
963962
}

‎trunk/src/librustc/middle/astencode.rs

Lines changed: 52 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use middle::{ty, typeck, moves};
2525
use middle;
2626
use util::ppaux::ty_to_str;
2727

28-
use core::iterator::IteratorUtil;
2928
use core::at_vec;
3029
use core::uint;
3130
use extra::ebml::reader;
@@ -827,113 +826,86 @@ fn encode_side_tables_for_id(ecx: @e::EncodeContext,
827826

828827
debug!("Encoding side tables for id %d", id);
829828

830-
{
831-
let r = tcx.def_map.find(&id);
832-
for r.iter().advance |def| {
833-
do ebml_w.tag(c::tag_table_def) |ebml_w| {
834-
ebml_w.id(id);
835-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
836-
(*def).encode(ebml_w)
837-
}
829+
for tcx.def_map.find(&id).each |def| {
830+
do ebml_w.tag(c::tag_table_def) |ebml_w| {
831+
ebml_w.id(id);
832+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
833+
(*def).encode(ebml_w)
838834
}
839835
}
840836
}
841837

842-
{
843-
let r = tcx.node_types.find(&(id as uint));
844-
for r.iter().advance |&ty| {
845-
do ebml_w.tag(c::tag_table_node_type) |ebml_w| {
846-
ebml_w.id(id);
847-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
848-
ebml_w.emit_ty(ecx, *ty);
849-
}
838+
for tcx.node_types.find(&(id as uint)).each |&ty| {
839+
do ebml_w.tag(c::tag_table_node_type) |ebml_w| {
840+
ebml_w.id(id);
841+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
842+
ebml_w.emit_ty(ecx, *ty);
850843
}
851844
}
852845
}
853846

854-
{
855-
let r = tcx.node_type_substs.find(&id);
856-
for r.iter().advance |tys| {
857-
do ebml_w.tag(c::tag_table_node_type_subst) |ebml_w| {
858-
ebml_w.id(id);
859-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
860-
ebml_w.emit_tys(ecx, **tys)
861-
}
847+
for tcx.node_type_substs.find(&id).each |tys| {
848+
do ebml_w.tag(c::tag_table_node_type_subst) |ebml_w| {
849+
ebml_w.id(id);
850+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
851+
ebml_w.emit_tys(ecx, **tys)
862852
}
863853
}
864854
}
865855

866-
{
867-
let r = tcx.freevars.find(&id);
868-
for r.iter().advance |&fv| {
869-
do ebml_w.tag(c::tag_table_freevars) |ebml_w| {
870-
ebml_w.id(id);
871-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
872-
do ebml_w.emit_from_vec(**fv) |ebml_w, fv_entry| {
873-
encode_freevar_entry(ebml_w, *fv_entry)
874-
}
856+
for tcx.freevars.find(&id).each |&fv| {
857+
do ebml_w.tag(c::tag_table_freevars) |ebml_w| {
858+
ebml_w.id(id);
859+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
860+
do ebml_w.emit_from_vec(**fv) |ebml_w, fv_entry| {
861+
encode_freevar_entry(ebml_w, *fv_entry)
875862
}
876863
}
877864
}
878865
}
879866

880867
let lid = ast::def_id { crate: ast::local_crate, node: id };
881-
{
882-
let r = tcx.tcache.find(&lid);
883-
for r.iter().advance |&tpbt| {
884-
do ebml_w.tag(c::tag_table_tcache) |ebml_w| {
885-
ebml_w.id(id);
886-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
887-
ebml_w.emit_tpbt(ecx, *tpbt);
888-
}
868+
for tcx.tcache.find(&lid).each |&tpbt| {
869+
do ebml_w.tag(c::tag_table_tcache) |ebml_w| {
870+
ebml_w.id(id);
871+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
872+
ebml_w.emit_tpbt(ecx, *tpbt);
889873
}
890874
}
891875
}
892876

893-
{
894-
let r = tcx.ty_param_defs.find(&id);
895-
for r.iter().advance |&type_param_def| {
896-
do ebml_w.tag(c::tag_table_param_defs) |ebml_w| {
897-
ebml_w.id(id);
898-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
899-
ebml_w.emit_type_param_def(ecx, type_param_def)
900-
}
877+
for tcx.ty_param_defs.find(&id).each |&type_param_def| {
878+
do ebml_w.tag(c::tag_table_param_defs) |ebml_w| {
879+
ebml_w.id(id);
880+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
881+
ebml_w.emit_type_param_def(ecx, type_param_def)
901882
}
902883
}
903884
}
904885

905-
{
906-
let r = maps.method_map.find(&id);
907-
for r.iter().advance |&mme| {
908-
do ebml_w.tag(c::tag_table_method_map) |ebml_w| {
909-
ebml_w.id(id);
910-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
911-
encode_method_map_entry(ecx, ebml_w, *mme)
912-
}
886+
for maps.method_map.find(&id).each |&mme| {
887+
do ebml_w.tag(c::tag_table_method_map) |ebml_w| {
888+
ebml_w.id(id);
889+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
890+
encode_method_map_entry(ecx, ebml_w, *mme)
913891
}
914892
}
915893
}
916894

917-
{
918-
let r = maps.vtable_map.find(&id);
919-
for r.iter().advance |&dr| {
920-
do ebml_w.tag(c::tag_table_vtable_map) |ebml_w| {
921-
ebml_w.id(id);
922-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
923-
encode_vtable_res(ecx, ebml_w, *dr);
924-
}
895+
for maps.vtable_map.find(&id).each |&dr| {
896+
do ebml_w.tag(c::tag_table_vtable_map) |ebml_w| {
897+
ebml_w.id(id);
898+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
899+
encode_vtable_res(ecx, ebml_w, *dr);
925900
}
926901
}
927902
}
928903

929-
{
930-
let r = tcx.adjustments.find(&id);
931-
for r.iter().advance |adj| {
932-
do ebml_w.tag(c::tag_table_adjustments) |ebml_w| {
933-
ebml_w.id(id);
934-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
935-
(**adj).encode(ebml_w)
936-
}
904+
for tcx.adjustments.find(&id).each |adj| {
905+
do ebml_w.tag(c::tag_table_adjustments) |ebml_w| {
906+
ebml_w.id(id);
907+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
908+
(**adj).encode(ebml_w)
937909
}
938910
}
939911
}
@@ -944,15 +916,12 @@ fn encode_side_tables_for_id(ecx: @e::EncodeContext,
944916
}
945917
}
946918

947-
{
948-
let r = maps.capture_map.find(&id);
949-
for r.iter().advance |&cap_vars| {
950-
do ebml_w.tag(c::tag_table_capture_map) |ebml_w| {
951-
ebml_w.id(id);
952-
do ebml_w.tag(c::tag_table_val) |ebml_w| {
953-
do ebml_w.emit_from_vec(*cap_vars) |ebml_w, cap_var| {
954-
cap_var.encode(ebml_w);
955-
}
919+
for maps.capture_map.find(&id).each |&cap_vars| {
920+
do ebml_w.tag(c::tag_table_capture_map) |ebml_w| {
921+
ebml_w.id(id);
922+
do ebml_w.tag(c::tag_table_val) |ebml_w| {
923+
do ebml_w.emit_from_vec(*cap_vars) |ebml_w, cap_var| {
924+
cap_var.encode(ebml_w);
956925
}
957926
}
958927
}

‎trunk/src/librustc/middle/borrowck/check_loans.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// 4. moves do not affect things loaned out in any way
1919

2020
use core::prelude::*;
21-
use core::iterator::IteratorUtil;
2221

2322
use core::hashmap::HashSet;
2423
use core::uint;
@@ -582,15 +581,14 @@ impl<'self> CheckLoanCtxt<'self> {
582581
// FIXME(#4384) inadequare if/when we permit `move a.b`
583582

584583
// check for a conflicting loan:
585-
let r = opt_loan_path(cmt);
586-
for r.iter().advance |&lp| {
584+
for opt_loan_path(cmt).each |&lp| {
587585
for self.each_in_scope_restriction(cmt.id, lp) |loan, _| {
588586
// Any restriction prevents moves.
589587
return MoveWhileBorrowed(lp, loan.loan_path, loan.span);
590588
}
591589
}
592590

593-
MoveOk
591+
return MoveOk;
594592
}
595593

596594
pub fn check_call(&mut self,
@@ -702,9 +700,9 @@ fn check_loans_in_expr<'a>(expr: @ast::expr,
702700
if !this.move_data.is_assignee(expr.id) {
703701
let cmt = this.bccx.cat_expr_unadjusted(expr);
704702
debug!("path cmt=%s", cmt.repr(this.tcx()));
705-
let r = opt_loan_path(cmt);
706-
for r.iter().advance |&lp| {
707-
this.check_if_path_is_moved(expr.id, expr.span, MovedInUse, lp);
703+
for opt_loan_path(cmt).each |&lp| {
704+
this.check_if_path_is_moved(expr.id, expr.span,
705+
MovedInUse, lp);
708706
}
709707
}
710708
}

0 commit comments

Comments
 (0)